Only in util-linux.orig: kbdrate-1.06.tar.gz diff -dur --exclude='.emacs*' --exclude=RCS util-linux.orig/SPEC/util-linux.spec util-linux/SPEC/util-linux.spec --- util-linux.orig/SPEC/util-linux.spec 2005-03-12 18:00:21 +0600 +++ util-linux/SPEC/util-linux.spec 2005-04-07 06:48:53 +0700 @@ -1,10 +1,10 @@ # -*- rpm-spec -*- -# $Id: util-linux,v 1.5 2005/03/12 11:57:04 me Exp $ +# $Id: util-linux.spec,v 1.4 2005/04/06 23:48:53 ivan Exp $ %define main_ver 2.12p Name: util-linux Version: %main_ver -Release: alt2 +Release: alt3 %def_without hwclock %def_without getopt @@ -19,15 +19,12 @@ Summary: A collection of basic system utilities License: GPL Group: System/Base -Url: ftp://ftp.win.tue.nl/pub/linux-local/utils/%name +Url: ftp://ftp.kernel.org/pub/linux/utils/%name Packager: Util-linux Development Team Source: %name-%version.tar.bz2 -Source1: kbdrate-1.06.tar.gz Source3: %name-2.10-chfn.pamd Source4: %name-2.10-chsh.pamd -Source5: %name-2.9w-kbdrate.pamd -Source6: %name-2.9w-kbdrate.apps # Extra utils. Source10: pause.s @@ -70,7 +67,6 @@ Patch103: %name-2.12p-alt-encryption.patch #new -Patch200: %name-2.12-rh-kbdrate-period-fix.patch Patch201: %name-2.12p-alt-lseek64.patch Patch202: %name-2.12p-rh-raw-handle-nonpresent-devs.patch Patch203: %name-2.12a-rh-mountbylabel-dm.patch @@ -164,27 +160,6 @@ Small partitioning program with argument interface, that will be hard for linux newbie, but it is extra stable, and you can trust it. -%package -n kbdrate -Summary: Reset the keyboard repeat rate and delay time -Group: System/Configuration/Hardware - -%description -n kbdrate -This package is used to change the keyboard repeat rate and delay time. -The delay is the amount of time that a key must be depressed before it -will start to repeat. - -%package -n kbdrate-usermode -Summary: Usermode bindings for kbdrate -Group: System/Configuration/Hardware -Requires: kbdrate = %version-%release - -%description -n kbdrate-usermode -Kbdrate package is used to change the keyboard repeat rate and delay time. -The delay is the amount of time that a key must be depressed before it -will start to repeat. - -This package contains usermode bindings for kbdrate. - %if_with hwclock %package -n hwclock Summary: Query and set the hardware clock @@ -240,7 +215,7 @@ The look utility displays any lines in file which contain string as a prefix. %prep -%setup -q -a1 +%setup -q #setup config %__subst 's,^HAVE_PAM=.*,HAVE_PAM=yes, @@ -306,7 +281,6 @@ #end mount #begin new -#%patch200 -p1 %patch201 -p1 %if_with raw @@ -363,10 +337,6 @@ gcc $RPM_OPT_FLAGS -o rescuept rescuept.c popd -pushd kbdrate - cc $RPM_OPT_FLAGS -o kbdrate kbdrate.c -popd - gcc -nostartfiles -nodefaultlibs -nostdlib pause.s -o pause gcc $RPM_OPT_FLAGS chstk.c -o chstk gcc $RPM_OPT_FLAGS stacktest.c -o stacktest @@ -378,7 +348,7 @@ install -p -m644 rescuept/README docs/README.rescuept %install -mkdir -p $RPM_BUILD_ROOT/{bin,sbin,etc/{pam.d,security/console.apps}} +mkdir -p $RPM_BUILD_ROOT/{bin,sbin,etc/pam.d} mkdir -p $RPM_BUILD_ROOT{%_bindir,%_sbindir,%_libdir,%_infodir,%_mandir/man{1,8}} for f in `cd po; echo *.po`; do @@ -412,9 +382,6 @@ install -p -m640 $RPM_SOURCE_DIR/%name-2.10-chsh.pamd $RPM_BUILD_ROOT%_sysconfdir/pam.d/chfn %endif -install -p -m640 $RPM_SOURCE_DIR/%name-2.9w-kbdrate.pamd $RPM_BUILD_ROOT%_sysconfdir/pam.d/kbdrate -install -p -m640 $RPM_SOURCE_DIR/%name-2.9w-kbdrate.apps $RPM_BUILD_ROOT%_sysconfdir/security/console.apps/kbdrate - install -pD -m755 $RPM_SOURCE_DIR/mount.control $RPM_BUILD_ROOT/etc/control.d/facilities/mount install -pD -m755 $RPM_SOURCE_DIR/write.control $RPM_BUILD_ROOT/etc/control.d/facilities/write @@ -423,10 +390,6 @@ install -p -m755 nologin $RPM_BUILD_ROOT/sbin/ install -p -m644 nologin.8 $RPM_BUILD_ROOT%_man8dir/ -install -p -m755 kbdrate/kbdrate $RPM_BUILD_ROOT/sbin/ -install -p -m644 kbdrate/kbdrate.8 $RPM_BUILD_ROOT%_man8dir/ -%__ln_s %_libdir/helper/consolehelper $RPM_BUILD_ROOT%_bindir/kbdrate - # This has dependencies on stuff in /usr %ifnarch sparc sparc64 sparcv9 mv $RPM_BUILD_ROOT/sbin/cfdisk $RPM_BUILD_ROOT%_sbindir/ @@ -488,7 +451,7 @@ #bindir echo '%_defattr' >>%name.lang /bin/ls -1 $RPM_BUILD_ROOT%_bindir | - egrep -v '^(write|getopt|kbdrate|look)$' | + egrep -v '^(write|getopt|look)$' | sed -e 's|^\(.*\)$|%%_bindir/\1|g' >>%name.lang #sbindir @@ -501,7 +464,7 @@ egrep -v '^(getopt|login|look)' | sed -e 's|^\(.*\)$|%%_mandir/man1/\1*|g' >>%name.lang /bin/ls -1 $RPM_BUILD_ROOT%_man8dir | - egrep -v '(mount|^swapo|losetup|^kbdrate|clock|getty|fdisk)' | + egrep -v '(mount|^swapo|losetup|clock|getty|fdisk)' | sed -e 's|^\(.*\)$|%%_man8dir/\1*|g' >>%name.lang #/bin @@ -511,9 +474,12 @@ #/sbin /bin/ls -1 $RPM_BUILD_ROOT/sbin | - egrep -v '(^swapo|^losetup|^kbdrate|clock|getty|fdisk)' | + egrep -v '(^swapo|^losetup|clock|getty|fdisk)' | sed -e 's|^\(.*\)$|/sbin/\1|g' >>%name.lang +# Remove unpackaged files (to pass RPM check): +rm $RPM_BUILD_ROOT/bin/login $RPM_BUILD_ROOT/usr/share/man/man1/login.* + %pre [ $1 -eq 1 ] || /usr/sbin/control-dump write @@ -586,20 +552,16 @@ %_man8dir/sfdisk.* %doc sfdisk/* -%files -n kbdrate -/sbin/kbdrate -%_man8dir/kbdrate.* - -%files -n kbdrate-usermode -%config(noreplace) %_sysconfdir/pam.d/kbdrate -%config(noreplace) %_sysconfdir/security/console.apps/kbdrate -%_bindir/kbdrate - %files -n look %_bindir/look %_man1dir/look.* %changelog +* Thu Apr 7 2005 Ivan Zakharyaschev 2.12p-alt3 +- kbdrate is now packaged in kbd package. +- URL changed according to + ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/README-site-change. + * Sat Mar 12 2005 Sergey Bolshakov 2.12p-alt2 - NFSv4 support for mount(1) resurrected Only in util-linux.orig: util-linux-2.12-rh-kbdrate-period-fix.patch Only in util-linux.orig: util-linux-2.9w-kbdrate.apps Only in util-linux.orig: util-linux-2.9w-kbdrate.pamd