From 4b38178a438287758624d3ae0d8bb2ec938173ef Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 06:39:35 +0000 Subject: [PATCH] auto-import changelog data from kbd-1.06-20.src.rpm Tue Jul 09 2002 Bill Nottingham 1.06-20 - fix speakup keymap names Tue Jul 09 2002 Phil Knirsch 1.06-19 - Evil hack to make setfont work correctly on all consoles (#68018) Thu Jun 27 2002 Bill Nottingham 1.06-18 - move unicode_stop to /bin too - fix path to loadkeys in keytable.init - add in speakup keymaps Fri Jun 21 2002 Tim Powers - automated rebuild Tue Jun 11 2002 Nalin Dahyabhai 1.06-16 - fix incorrect path in console.apps configuration file Thu May 30 2002 Bill Nottingham 1.06-14 - move some more stuff to /bin (unicode_start and dependencies) Thu May 23 2002 Tim Powers - automated rebuild --- kbd.spec | 35 ++++++++++++++++++++++++++++++++--- kbdrate.apps | 2 +- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/kbd.spec b/kbd.spec index 824817b..1ceebf9 100644 --- a/kbd.spec +++ b/kbd.spec @@ -1,7 +1,7 @@ Summary: Tools for configuring the console (keyboard, virtual terminals, etc.) Name: kbd Version: 1.06 -Release: 12 +Release: 20 License: GPL Group: System Environment/Base Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2 @@ -16,6 +16,8 @@ Patch1: kbd-1.06-compose.patch Patch2: kbd-1.0.6-cflags.patch Patch3: kbd-1.06-nonroot.patch Patch4: kbd-1.06-othervt.patch +Patch5: kbd-speakup.patch +Patch6: kbd-1.06-setfont.patch Obsoletes: console-tools Provides: console-tools Prereq: sed mktemp initscripts >= 5.86-1 @@ -33,6 +35,8 @@ fonts, the virtual terminals and font files. %patch2 -p1 -b .p2 %patch3 -p1 -b .p3 %patch4 -p1 -b .p4 +%patch5 -p0 +%patch6 -p1 -b .setfont %build export OLD_PO_FILE_INPUT=yes @@ -55,7 +59,9 @@ make rm -rf ${RPM_BUILD_ROOT} make install DESTDIR=${RPM_BUILD_ROOT} -mv $RPM_BUILD_ROOT%{_bindir}/setfont $RPM_BUILD_ROOT/bin +for binary in setfont dumpkeys kbd_mode unicode_start unicode_stop ; do + mv $RPM_BUILD_ROOT%{_bindir}/$binary $RPM_BUILD_ROOT/bin +done # Add init scripts install -d -m 755 $RPM_BUILD_ROOT/etc/rc.d/init.d @@ -92,7 +98,7 @@ fi if [ -e /etc/sysconfig/i18n ]; then TMP=`mktemp /tmp/i18nXXXXXX` source /etc/sysconfig/i18n - SYSFONT_NEW=`echo $SYSFONT |sed -e "s/sun//"` + SYSFONT_NEW=`echo $SYSFONT |sed -e "s/sun//;s/lat0-/lat9-/"` CHARSET=`echo $SYSFONTACM |sed -e "s/iso0/8859-/;s/iso/8859-/"` [ "$CHARSET" = "8859-1" -a "`echo $SYSFONT_NEW | sed -e 's/-.*//'`" = "lat0" ] && CHARSET="8859-15" cat /etc/sysconfig/i18n |sed -e "s/^SYSFONT=.*/# &/g;s/^SYSFONTACM/# SYSFONTACM/g" >$TMP @@ -116,6 +122,29 @@ fi %config %{_sysconfdir}/pam.d/* %changelog +* Tue Jul 9 2002 Bill Nottingham 1.06-20 +- fix speakup keymap names + +* Tue Jul 09 2002 Phil Knirsch 1.06-19 +- Evil hack to make setfont work correctly on all consoles (#68018) + +* Thu Jun 27 2002 Bill Nottingham 1.06-18 +- move unicode_stop to /bin too +- fix path to loadkeys in keytable.init +- add in speakup keymaps + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Tue Jun 11 2002 Nalin Dahyabhai 1.06-16 +- fix incorrect path in console.apps configuration file + +* Thu May 30 2002 Bill Nottingham 1.06-14 +- move some more stuff to /bin (unicode_start and dependencies) + +* Thu May 23 2002 Tim Powers +- automated rebuild + * Mon Feb 25 2002 Bernhard Rosenkraenzer 1.06-12 - Rebuild in new environment diff --git a/kbdrate.apps b/kbdrate.apps index 8604e80..81b0f64 100644 --- a/kbdrate.apps +++ b/kbdrate.apps @@ -1,3 +1,3 @@ USER= -PROGRAM=/sbin/kbdrate +PROGRAM=/usr/sbin/kbdrate SESSION=false