Author: glen Date: Mon Mar 15 14:12:03 2010 GMT Module: packages Tag: HEAD ---- Log message: - make "loadkeys -d" work again; rel 4
---- Files affected: packages/kbd: kbd.spec (1.104 -> 1.105) , kbd-defkeymap.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/kbd/kbd.spec diff -u packages/kbd/kbd.spec:1.104 packages/kbd/kbd.spec:1.105 --- packages/kbd/kbd.spec:1.104 Thu Mar 12 17:52:22 2009 +++ packages/kbd/kbd.spec Mon Mar 15 15:11:58 2010 @@ -6,7 +6,7 @@ Summary(pl.UTF-8): Narzędzia do obsługi konsoli Name: kbd Version: 1.15 -Release: 3 +Release: 4 License: GPL v2+ Group: Applications/Console Source0: ftp://ftp.altlinux.org/pub/people/legion/kbd/%{name}-%{version}.tar.gz @@ -32,6 +32,7 @@ Patch4: %{name}-ngettext.patch Patch5: %{name}-po.patch Patch6: %{name}-tty-detect.patch +Patch7: %{name}-defkeymap.patch URL: http://www.win.tue.nl/~aeb/linux/ BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -72,6 +73,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build %{__aclocal} @@ -97,23 +99,22 @@ mv $RPM_BUILD_ROOT%{_bindir}/$f $RPM_BUILD_ROOT/bin done -install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/console +install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/console +cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/console %ifarch sparc sparc64 -sed 's/KEYTABLE=pl2/KEYTABLE=sunkeymap/' %{SOURCE2} > $RPM_BUILD_ROOT/etc/sysconfig/console -%else -install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/console +sed -i -e 's/KEYTABLE=pl2/KEYTABLE=sunkeymap/' $RPM_BUILD_ROOT/etc/sysconfig/console %endif -install %{SOURCE4} $RPM_BUILD_ROOT%{_ldatadir}/consolefonts/lat2u-16.psfu.gz -gunzip -c %{SOURCE5} >$RPM_BUILD_ROOT%{_ldatadir}/unimaps/lat2u.uni +cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_ldatadir}/consolefonts/lat2u-16.psfu.gz +gunzip -c %{SOURCE5} > $RPM_BUILD_ROOT%{_ldatadir}/unimaps/lat2u.uni gzip -c %{SOURCE8} > $RPM_BUILD_ROOT%{_ldatadir}/keymaps/i386/qwerty/pl1.map.gz gzip -c %{SOURCE9} > $RPM_BUILD_ROOT%{_ldatadir}/keymaps/mac/all/mac-pl.map.gz gzip -c %{SOURCE10} > $RPM_BUILD_ROOT%{_ldatadir}/keymaps/i386/qwerty/pl3.map.gz gzip -c %{SOURCE11} > $RPM_BUILD_ROOT%{_ldatadir}/keymaps/i386/qwerty/pl4.map.gz -install %{SOURCE6} $RPM_BUILD_ROOT/etc/profile.d -install %{SOURCE7} $RPM_BUILD_ROOT/etc/profile.d +cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/profile.d +cp -a %{SOURCE7} $RPM_BUILD_ROOT/etc/profile.d bzip2 -dc %{SOURCE3} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} @@ -164,6 +165,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.105 2010/03/15 14:11:58 glen +- make "loadkeys -d" work again; rel 4 + Revision 1.104 2009/03/12 16:52:22 baggins - rel 3 - added tty-detect patch (do nothing in unicode_{start,stop} if we can't detect tty) ================================================================ Index: packages/kbd/kbd-defkeymap.patch diff -u /dev/null packages/kbd/kbd-defkeymap.patch:1.1 --- /dev/null Mon Mar 15 15:12:04 2010 +++ packages/kbd/kbd-defkeymap.patch Mon Mar 15 15:11:58 2010 @@ -0,0 +1,11 @@ +--- kbd-1.15/src/paths.h~ 2008-03-13 18:46:23.000000000 +0200 ++++ kbd-1.15/src/paths.h 2010-03-15 16:07:43.213588671 +0200 +@@ -19,7 +19,7 @@ + # define DEFMAP "sunkeymap.kmap" + # define KERNDIR "/usr/src/linux/drivers/sbus/char" + #else +-# define DEFMAP "defkeymap.kmap" ++# define DEFMAP "defkeymap.map" + # define KERNDIR "/usr/src/linux/drivers/char" + #endif + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kbd/kbd.spec?r1=1.104&r2=1.105&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
