diff --git a/.console-setup.metadata b/.console-setup.metadata new file mode 100644 index 0000000..6b6685b --- /dev/null +++ b/.console-setup.metadata @@ -0,0 +1 @@ +01156c6bf0f39252a0bcfc25666a9394074a8959 SOURCES/console-setup_1.111.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2f4ec09 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/console-setup_1.111.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/console-setup-1.76-fsf-address.patch b/SOURCES/console-setup-1.76-fsf-address.patch new file mode 100644 index 0000000..2950c28 --- /dev/null +++ b/SOURCES/console-setup-1.76-fsf-address.patch @@ -0,0 +1,12 @@ +diff -up console-setup/Keyboard/ckbcomp.orig console-setup/Keyboard/ckbcomp +--- console-setup/Keyboard/ckbcomp.orig 2012-06-26 12:04:16.612309745 +0200 ++++ console-setup/Keyboard/ckbcomp 2012-06-26 12:21:06.448385970 +0200 +@@ -15,7 +15,7 @@ + + # If you have not received a copy of the GNU General Public License + # along with this program, write to the Free Software Foundation, Inc., +-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + use warnings 'all'; + use strict; diff --git a/SOURCES/console-setup-1.76-paths.patch b/SOURCES/console-setup-1.76-paths.patch new file mode 100644 index 0000000..d6fd0b7 --- /dev/null +++ b/SOURCES/console-setup-1.76-paths.patch @@ -0,0 +1,163 @@ +diff -up console-setup/Makefile.orig console-setup/Makefile +--- console-setup/Makefile.orig 2012-06-19 16:24:46.063272458 +0200 ++++ console-setup/Makefile 2012-06-20 13:11:09.926247002 +0200 +@@ -2,7 +2,7 @@ prefix = /usr/local + # etcdir must be either /etc or + etcdir = $(prefix)/etc + bootprefix = $(patsubst %/usr,%/,$(prefix:%/=%)) +-mandir = $(prefix)/share/man ++mandir = $(prefix)/usr/share/man + + SHELL = /bin/sh + +@@ -36,8 +36,8 @@ build-all: build-linux build-freebsd bui + + .PHONY: install-common + install-common: build-common +- install -d $(bootprefix)/bin/ +- install setupcon $(bootprefix)/bin/ ++ install -d $(bootprefix)/usr/bin/ ++ install setupcon $(bootprefix)/usr/bin/ + install -d $(etcdir)/default + install -m 644 config/keyboard $(etcdir)/default/ + install -m 644 config/console-setup $(etcdir)/default/ +@@ -49,10 +49,10 @@ install-common: build-common + + .PHONY: install-common-linux + install-common-linux: build-linux +- install -d $(prefix)/share/consolefonts/ +- install -m 644 Fonts/*.psf.gz $(prefix)/share/consolefonts/ +- install -d $(prefix)/share/consoletrans +- install -m 644 acm/*.acm.gz $(prefix)/share/consoletrans/ ++ install -d $(prefix)/usr/share/consolefonts/ ++ install -m 644 Fonts/*.psf.gz $(prefix)/usr/share/consolefonts/ ++ install -d $(prefix)/usr/share/consoletrans ++ install -m 644 acm/*.acm.gz $(prefix)/usr/share/consoletrans/ + install -d $(etcdir)/console-setup + install -m 644 Keyboard/compose.*.inc $(etcdir)/console-setup/ + install -m 644 Keyboard/remap.inc $(etcdir)/console-setup/ +@@ -77,8 +77,8 @@ install-ckbcomp: + mkdir -p $(etcdir)/console-setup \ + && cp -r Keyboard/ckb/ $(etcdir)/console-setup/ckb; \ + fi +- install -d $(prefix)/bin/ +- install -m 755 Keyboard/ckbcomp $(prefix)/bin/ ++ install -d $(prefix)/usr/bin/ ++ install -m 755 Keyboard/ckbcomp $(prefix)/usr/bin/ + install -d $(mandir)/man1/ + install -m 644 man/ckbcomp.1 $(mandir)/man1/ + +diff -up console-setup/man/ckbcomp.1.orig console-setup/man/ckbcomp.1 +--- console-setup/man/ckbcomp.1.orig 2012-06-26 13:03:52.177823914 +0200 ++++ console-setup/man/ckbcomp.1 2012-06-26 14:21:00.460672366 +0200 +@@ -46,7 +46,7 @@ Print a usage message and exit. + .BI -charmap\ charmap + The encoding to use for the output keymap. There should be an + character mapping table defining this encoding in +-.IR /usr/local/share/consoletrans . ++.IR /usr/share/consoletrans . + Definitions of the following charmaps are provided: + .nh + .BR ARMSCII-8 , +@@ -86,8 +86,9 @@ for files included by the keymap descrip + multiple times. If a file can not be found in any of the specified + directories, it will be searched also in some other standard + locations, such as +-.IR /usr/local/etc/console-setup/ckb , +-.IR /usr/local/share/X11/xkb ++.IR /etc/console-setup/ckb , ++.IR /usr/local/share/X11/xkb , ++.IR /usr/share/X11/xkb + and + .IR /etc/X11/xkb + +@@ -167,9 +168,9 @@ Specifies the layout variant used to cho + Adds an option used to choose component names. + + .SH FILES +-.I /usr/local/share/consoletrans ++.I /usr/share/consoletrans + .br +-.I /usr/local/etc/console-setup/ckb ++.I /etc/console-setup/ckb + .br + .I /usr/share/X11/xkb + .br +diff -up console-setup/man/console-setup.5.orig console-setup/man/console-setup.5 +--- console-setup/man/console-setup.5.orig 2012-06-26 13:10:37.076260103 +0200 ++++ console-setup/man/console-setup.5 2012-06-26 14:19:44.635215971 +0200 +@@ -378,16 +378,16 @@ Completely covered by the following font + The standard location of the + .B console-setup + configuration file is +-.IR /usr/local/etc/default/console-setup . ++.IR /etc/default/console-setup . + The keyboard configuration is in +-.IR /usr/local/etc/default/keyboard . ++.IR /etc/default/keyboard . + Fonts that can be used with the variable + .B FONT + are usually installed in +-.IR /usr/share/consolefonts/ " or " /usr/share/syscons/fonts/ . ++.IR /usr/share/consolefonts/ " or " /lib/kbd/consolefonts/ . + Translation maps that can be used with the variable CONSOLE_MAP are + usually installed in +-.IR /usr/share/consoletrans/ " or " /usr/share/syscons/scrnmaps/ . ++.IR /usr/share/consoletrans/ " or " /lib/kbd/consoletrans/ . + + .SH NOTES + The aim of the Terminus font is to reduce the eyes-fatigue when one +diff -up console-setup/man/keyboard.5.orig console-setup/man/keyboard.5 +--- console-setup/man/keyboard.5.orig 2012-06-26 13:09:26.323834480 +0200 ++++ console-setup/man/keyboard.5 2012-06-26 13:34:33.243901584 +0200 +@@ -152,12 +152,12 @@ on FreeBSD. + The standard location of the + .B keyboard + file is +-.IR /usr/local/etc/default/keyboard . ++.IR /etc/default/keyboard . + Description of all available keyboard models, layouts, variants and + options is available in +-.IR /usr/local/share/X11/xkb/rules/xorg.lst . ++.IR /usr/share/X11/xkb/rules/xorg.lst . + In most cases, in +-.IR /usr/share/keymaps/ " or " /usr/share/syscons/keymaps/ ++.IR /lib/kbd/keymaps/ + you will find several keymaps that can be used with the variable + .BR KMAP . + +diff -up console-setup/man/setupcon.1.orig console-setup/man/setupcon.1 +--- console-setup/man/setupcon.1.orig 2012-06-26 13:00:14.192512373 +0200 ++++ console-setup/man/setupcon.1 2012-06-26 13:03:27.247673862 +0200 +@@ -22,11 +22,11 @@ the console. Most of the time you invok + without arguments. The keyboard configuration is specified in + .I ~/.keyboard + or +-.IR /usr/local/etc/default/keyboard . ++.IR /etc/default/keyboard . + The font configuration is specified in + .I ~/.console-setup + or +-.IR /usr/local/etc/default/console-setup . ++.IR /etc/default/console-setup . + Consult + .BR keyboard (5) + and +@@ -131,13 +131,13 @@ for the default configuration. + .br + .I ~/.keyboard + .br +-.I /usr/local/etc/default/console-setup ++.I /etc/default/console-setup + .br +-.I /usr/local/etc/default/keyboard ++.I /etc/default/keyboard + .br +-.I /usr/local/etc/default/console-setup.VARIANT ++.I /etc/default/console-setup.VARIANT + .br +-.I /usr/local/etc/default/keyboard.VARIANT ++.I /etc/default/keyboard.VARIANT + .br + .I /etc/console-setup/ + diff --git a/SPECS/console-setup.spec b/SPECS/console-setup.spec new file mode 100644 index 0000000..9b73340 --- /dev/null +++ b/SPECS/console-setup.spec @@ -0,0 +1,120 @@ + +Name: console-setup +Version: 1.111 +Release: 1%{?dist} +Summary: Tools for configuring the console using X Window System key maps + +Group: Applications/System +# For a breakdown of the licensing, see COPYRIGHT, copyright, copyright.fonts and copyright.xkb +License: GPLv2+ and MIT and Public Domain +URL: http://packages.debian.org/cs/sid/console-setup +Source0: http://ftp.de.debian.org/debian/pool/main/c/%{name}/%{name}_%{version}.tar.gz + +# Fixes installing paths to Fedora style +Patch0: console-setup-1.76-paths.patch +# Fixes FSF address, sent to upstream +Patch1: console-setup-1.76-fsf-address.patch + +Requires: kbd +# require 'xkeyboard-config' to have X Window keyboard descriptions? + +BuildArch: noarch + +%description +This package provides the console with the same keyboard configuration +scheme that X Window System has. Besides the keyboard, the package configures +also the font on the console. It includes a rich collection of fonts and +supports several languages that would be otherwise unsupported on the console +(such as Armenian, Georgian, Lao and Thai). + + +%prep +%setup -q +%patch0 -p1 -b .paths +%patch1 -p1 -b .fsf-address + + +%build +make build-linux + + +%install +rm -rf $RPM_BUILD_ROOT +make prefix=$RPM_BUILD_ROOT install-linux +# we don't want another set of keyboard descriptions, we want to use descriptions from +# xkeyboard-config (require it?), so removing it +# or maybe have these from tarball it in optional subpackage? +rm -rf $RPM_BUILD_ROOT/etc/console-setup + + +%files +%doc README COPYRIGHT CHANGES copyright.fonts copyright.xkb Fonts/copyright +%{_bindir}/ckbcomp +%{_bindir}/setupcon +%config(noreplace) %{_sysconfdir}/default/console-setup +%config(noreplace) %{_sysconfdir}/default/keyboard +%{_datadir}/consolefonts +%{_datadir}/consoletrans +%{_mandir}/*/* + + +%changelog +* Mon Sep 01 2014 Vitezslav Crhonek - 1.111-1 +- Update to latest upstream version + Resolves: #1129030 + +* Mon Aug 04 2014 Vitezslav Crhonek - 1.110-1 +- Update to latest upstream version + Resolves: #1124031 + +* Sat Jun 07 2014 Fedora Release Engineering - 1.108-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 09 2014 Vitezslav Crhonek - 1.108-1 +- Update to latest upstream version + Resolves: #1096045 + +* Thu Apr 10 2014 Vitezslav Crhonek - 1.107-1 +- Update to latest upstream version + Resolves: #1084949 + +* Thu Mar 20 2014 Vitezslav Crhonek - 1.106-1 +- Update to latest upstream version + Resolves: #1078695 + +* Thu Jan 02 2014 Vitezslav Crhonek - 1.104-1 +- Update to latest upstream version + Resolves: #1040384 + +* Wed Nov 06 2013 Vitezslav Crhonek - 1.102-1 +- Update to latest upstream version + Resolves: #1026672 +- Fix bogus date in %%changelog + +* Sat Aug 03 2013 Fedora Release Engineering - 1.87-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 17 2013 Petr Pisar - 1.87-3 +- Perl 5.18 rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 1.87-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Nov 29 2012 Vitezslav Crhonek - 1.87-1 +- Update to latest upstream version + +* Wed Jul 18 2012 Fedora Release Engineering - 1.80-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jul 04 2012 Vitezslav Crhonek - 1.80-1 +- Update to latest upstream version +- Fix files listed twice build warning + +* Tue Jun 26 2012 Vitezslav Crhonek - 1.76-2 +- Fix License field +- Do not own /etc/default directory +- Fix FSF address in ckbcomp utility +- Fix paths in manpages + +* Wed Jun 20 2012 Vitezslav Crhonek - 1.76-1 +- Initial support