rpms/kbd/devel kbd.spec,1.26,1.27 keytable.init,1.4,NONE

[fedora-cvs-commits at redhat.com]

Author: mitr

Update of /cvs/dist/rpms/kbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16348

Modified Files:
	kbd.spec 
Removed Files:
	keytable.init 
Log Message:
* Fri Jan 20 2006 Miloslav Trmac <mitr at redhat.com> - 1.12-13
- Fix build with new coreutils
- Hardcode paths in unicode_start to avoid a few file lookups (#178329)
- Drop unnecessary Prereq: sed mktemp



Index: kbd.spec
===================================================================
RCS file: /cvs/dist/rpms/kbd/devel/kbd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- kbd.spec	9 Dec 2005 22:41:07 -0000	1.26
+++ kbd.spec	20 Jan 2006 17:58:10 -0000	1.27
@@ -1,15 +1,14 @@
 Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
 Name: kbd
 Version: 1.12
-Release: 12.1
+Release: 13
 License: GPL
 Group: System Environment/Base
 Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2
 Source1: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2.sign
 Source2: kbdrate.apps
 Source3: kbdrate.pam
-Source4: keytable.init
-Source5: kbd-latsun-fonts.tar.bz2
+Source4: kbd-latsun-fonts.tar.bz2
 Requires: pam >= 0.66-4, /etc/pam.d/system-auth, usermode
 BuildRoot: %{_tmppath}/%{name}-root
 Patch0: kbd-1.08-sparc.patch
@@ -25,7 +24,7 @@
 Obsoletes: console-tools
 Provides: console-tools
 Conflicts: util-linux < 2.11r-9
-Prereq: sed mktemp initscripts >= 5.86-1
+Prereq: initscripts >= 5.86-1
 ExcludeArch: s390 s390x
 
 %description
@@ -35,7 +34,7 @@
 
 %prep
 
-%setup -q -a 5
+%setup -q -a 4
 %patch0 -p1 -b .sparc
 %patch1 -p1
 %patch2 -p1 -b .terminal
@@ -69,7 +68,7 @@
 # We don't use % {configure} because the ./configure included here does not
 # understand most of the options.
 CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
-./configure --prefix=/ --datadir=/lib/kbd --mandir=%{_mandir}
+./configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir}
 
 # Override CFLAGS because this configure ignores them anyway, and LDFLAGS
 # because it defaults to -s, but that's a build policy decision.
@@ -79,29 +78,27 @@
 rm -rf $RPM_BUILD_ROOT
 
 # Basic install.
-make install \
-	BINDIR=$RPM_BUILD_ROOT/%{_bindir} \
-	LOADKEYS_BINDIR=$RPM_BUILD_ROOT/bin \
-	MANDIR=$RPM_BUILD_ROOT/%{_mandir} \
-	datadir=$RPM_BUILD_ROOT/lib/kbd \
-	DATADIR=$RPM_BUILD_ROOT/lib/kbd \
-	gnulocaledir=$RPM_BUILD_ROOT/%{_datadir}/locale \
-	localedir=$RPM_BUILD_ROOT/%{_datadir}/locale
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # Move binaries which we use before /usr is mounted from %{_bindir} to /bin.
 for binary in setfont dumpkeys kbd_mode unicode_start unicode_stop ; do
   mv $RPM_BUILD_ROOT%{_bindir}/$binary $RPM_BUILD_ROOT/bin
 done
 
+# Some microoptimization
+sed -i -e 's,\<kbd_mode\>,/bin/kbd_mode,g;s,\<setfont\>,/bin/setfont,g' \
+	$RPM_BUILD_ROOT/bin/unicode_start
+
+
 # Set up kbdrate to be userhelpered.
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 mv $RPM_BUILD_ROOT%{_bindir}/kbdrate $RPM_BUILD_ROOT%{_sbindir}
 ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/kbdrate
-install -c -m644 $RPM_SOURCE_DIR/kbdrate.apps \
+install -c -m644 %{SOURCE2} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/kbdrate
-install -c -m644 $RPM_SOURCE_DIR/kbdrate.pam \
+install -c -m644 %{SOURCE3} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kbdrate
 
 %find_lang %{name}
@@ -124,6 +121,11 @@
 %config %{_sysconfdir}/pam.d/*
 
 %changelog
+* Fri Jan 20 2006 Miloslav Trmac <mitr at redhat.com> - 1.12-13
+- Fix build with new coreutils
+- Hardcode paths in unicode_start to avoid a few file lookups (#178329)
+- Drop unnecessary Prereq: sed mktemp
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


--- keytable.init DELETED ---