Stop kbdrate using consolehelper

kbd.spec

@@ -1,19 +1,16 @@
 Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
 Name: kbd
 Version: 1.12
-Release: 28%{?dist}
+Release: 29%{?dist}
 # Except possibly for the restrictions mentioned in the directory consolefonts
 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
+Source2: kbd-latsun-fonts.tar.bz2
-Source3: kbdrate.pam
+Source3: kbd-sun12x22-fixed.tar.bz2
-Source4: kbd-latsun-fonts.tar.bz2
+Source4: ro_maps.tar.bz2
-Source5: kbd-sun12x22-fixed.tar.bz2
+Source5: terminus.tar.bz2
-Source6: ro_maps.tar.bz2
-Source7: terminus.tar.bz2
-Requires: pam >= 0.66-4, /etc/pam.d/system-auth, usermode
 BuildRequires: bison, flex, gettext
 BuildRoot: %{_tmppath}/%{name}-root
 Patch0: kbd-1.12-sparc.patch
@@ -41,8 +38,7 @@ system's console's behavior, including the keyboard, the screen
 fonts, the virtual terminals and font files.
 
 %prep
-
+%setup -q -a 2 -a 3 -a 4 -a 5
-%setup -q -a 4 -a 5 -a 6 -a 7
 %patch0 -p1 -b .sparc
 %patch1 -p1
 %patch2 -p1 -b .terminal
@@ -110,25 +106,13 @@ done
 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 %{SOURCE2} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/kbdrate
-install -c -m644 %{SOURCE3} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kbdrate
-
 # Link open to openvt
 ln -s openvt $RPM_BUILD_ROOT%{_bindir}/open
 
 %find_lang %{name}
 
 %clean
-[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
+rm -rf ${RPM_BUILD_ROOT}
 
 %triggerun -- kbd < 1.08-10.2
 /sbin/chkconfig --del keytable || :
@@ -138,13 +122,14 @@ ln -s openvt $RPM_BUILD_ROOT%{_bindir}/open
 %doc CHANGES CREDITS README doc/kbd.FAQ*.html doc/font-formats/*.html doc/utf/utf*
 /bin/*
 %{_bindir}/*
-%{_sbindir}/*
 %{_mandir}/*/*
 /lib/kbd
-%config %{_sysconfdir}/security/console.apps/*
-%config %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue Nov 27 2007 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.12-29
+- Stop kbdrate using consolehelper
+  Resolves: #393231
+
 * Thu Nov 15 2007 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.12-28
 - Fix ro.map.gz, add ro_std.map.gz, drop ro_win.map.gz,
   add Lat2-Terminus16.psf console font (many thanks to Alexandru Szasz

kbdrate.apps

@@ -1,3 +0,0 @@
-USER=<user>
-PROGRAM=/usr/sbin/kbdrate
-SESSION=false

kbdrate.pam

@@ -1,4 +0,0 @@
-#%PAM-1.0
-auth       sufficient	pam_rootok.so
-auth       required	pam_console.so
-account    required	pam_permit.so