packages: kbd/kbd.spec, kbd/resizecon-x86_64.patch (NEW) - package resizeco...

[glen]

Author: glen                         Date: Thu Aug 25 05:06:59 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- package resizecons on x86_64 (fc patch)

---- Files affected:
packages/kbd:
   kbd.spec (1.114 -> 1.115) , resizecon-x86_64.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kbd/kbd.spec
diff -u packages/kbd/kbd.spec:1.114 packages/kbd/kbd.spec:1.115
--- packages/kbd/kbd.spec:1.114	Tue Aug 23 07:18:57 2011
+++ packages/kbd/kbd.spec	Thu Aug 25 07:06:54 2011
@@ -31,6 +31,7 @@
 Patch2:		%{name}-tty-detect.patch
 Patch3:		%{name}-defkeymap.patch
 Patch4:		%{name}-po.patch
+Patch5:		resizecon-x86_64.patch
 URL:		http://www.win.tue.nl/~aeb/linux/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.9
@@ -69,6 +70,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__gettextize}
@@ -99,7 +101,7 @@
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/console
 cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/init/console.conf
 %ifarch sparc sparc64
-sed -i -e 's/KEYTABLE=pl2/KEYTABLE=sunkeymap/' $RPM_BUILD_ROOT/etc/sysconfig/console
+%{__sed} -i -e 's/KEYTABLE=pl2/KEYTABLE=sunkeymap/' $RPM_BUILD_ROOT/etc/sysconfig/console
 %endif
 
 cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_ldatadir}/consolefonts/lat2u-16.psfu.gz
@@ -115,7 +117,7 @@
 
 bzip2 -dc %{SOURCE3} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
-%{__rm} doc/{*,*/*}.sgml
+%{__rm} -f doc/{*,*/*}.sgml
 
 # Greek is el, not gr
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/gr
@@ -163,7 +165,7 @@
 %attr(755,root,root) %{_bindir}/psfgettable
 %attr(755,root,root) %{_bindir}/psfstriptable
 %attr(755,root,root) %{_bindir}/psfxtable
-%ifarch %{ix86}
+%ifarch %{ix86} %{x8664}
 %attr(755,root,root) %{_bindir}/resizecons
 %endif
 %attr(755,root,root) %{_bindir}/setkeycodes
@@ -199,7 +201,7 @@
 %{_mandir}/man8/kbdrate.8*
 %{_mandir}/man8/loadunimap.8*
 %{_mandir}/man8/mapscrn.8*
-%ifarch %{ix86}
+%ifarch %{ix86} %{x8664}
 %{_mandir}/man8/resizecons.8*
 %endif
 %{_mandir}/man8/setfont.8*
@@ -219,6 +221,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.115  2011/08/25 05:06:54  glen
+- package resizecons on x86_64 (fc patch)
+
 Revision 1.114  2011/08/23 05:18:57  glen
 - no point dumping keymap if it is not going to be used in unicode_start
 

================================================================
Index: packages/kbd/resizecon-x86_64.patch
diff -u /dev/null packages/kbd/resizecon-x86_64.patch:1.1
--- /dev/null	Thu Aug 25 07:06:59 2011
+++ packages/kbd/resizecon-x86_64.patch	Thu Aug 25 07:06:54 2011
@@ -0,0 +1,11 @@
+diff -up kbd-1.15.3/configure.ac.orig kbd-1.15.3/configure.ac
+--- kbd-1.15.3/configure.ac.orig	2011-08-22 16:01:11.456165128 +0200
++++ kbd-1.15.3/configure.ac	2011-08-22 16:01:38.878163675 +0200
+@@ -60,6 +60,7 @@ AM_CONDITIONAL(KEYCODES_PROGS, test "$KE
+ 
+ case $host_cpu in
+ 	i?86*) RESIZECONS_PROGS=yes ;;
++	x86_64*) RESIZECONS_PROGS=yes ;;
+ 	*)     RESIZECONS_PROGS=no ;;
+ esac
+ AM_CONDITIONAL(RESIZECONS_PROGS, test "$RESIZECONS_PROGS" = "yes")
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kbd/kbd.spec?r1=1.114&r2=1.115&f=u