Thu Jan 8 14:46:31 UTC 2009

Author: vcrhonek

Update of /cvs/extras/rpms/kbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16402

Modified Files:
	.cvsignore kbd.spec sources 
Added Files:
	kbd-1.15-keycodes-man.patch kbd-1.15-po.patch 
	kbd-1.15-resizecon-x86_64.patch kbd-1.15-sparc.patch 
	kbd-1.15-unicode_start.patch 
Removed Files:
	kbd-1.08-compose.patch kbd-1.08-rukbd.patch 
	kbd-1.08-terminal.patch kbd-1.12-Meta_utf8.patch 
	kbd-1.12-alias.patch kbd-1.12-dir.patch kbd-1.12-gr-el.patch 
	kbd-1.12-keycodes-man.patch kbd-1.12-no-user-map.patch 
	kbd-1.12-nostrip.patch kbd-1.12-resizecon-x86.patch 
	kbd-1.12-setfont-man.patch kbd-1.12-sparc.patch 
	kbd-1.12-trq-map.patch kbd-1.12.tar.bz2.sign 
Log Message:
Update to kbd-1.15

kbd-1.15-keycodes-man.patch:

--- NEW FILE kbd-1.15-keycodes-man.patch ---
diff -up kbd-1.15/man/man1/showkey.1_old kbd-1.15/man/man1/showkey.1
--- kbd-1.15/man/man1/showkey.1_old	2008-03-13 17:46:23.000000000 +0100
+++ kbd-1.15/man/man1/showkey.1	2008-12-10 12:31:38.000000000 +0100
@@ -80,6 +80,19 @@ corresponds to what the keyboard hardwar
 to know the scan codes sent by various keys it is better to boot a
 2.4 kernel. Since 2.6.9 there also is the boot option atkbd.softraw=0
 that tells the 2.6 kernel to return the actual scan codes.
+
+.SH NOTES
+The raw scan codes are available only on AT and PS/2 keyboards,
+and even then they are disabled unless the
+.B atkbd.softraw=0
+kernel parameter is used.
+When the raw scan codes are not available, the kernel uses a fixed built-in
+table to produce scan codes from keycodes.  Thus,
+.BR setkeycodes (8)
+can affect the output of
+.B showkey
+in scan code dump mode.
+
 .SH "SEE ALSO"
 .BR loadkeys (1),
 .BR dumpkeys (1),
diff -up kbd-1.15/man/man8/setkeycodes.8_old kbd-1.15/man/man8/setkeycodes.8
--- kbd-1.15/man/man8/setkeycodes.8_old	2008-12-10 12:31:56.000000000 +0100
+++ kbd-1.15/man/man8/setkeycodes.8	2008-12-10 12:37:36.000000000 +0100
@@ -41,6 +41,10 @@ to showkey(1), the command
 will assign the keycode 112 to it, and then loadkeys(1) can be used
 to define the function of this key.
 
+USB keyboards have standardized keycodes and
+.B setkeycodes
+doesn't affect them at all.
+
 .SH "2.6 KERNELS"
 In 2.6 kernels key codes lie in the range 1-255, instead of 1-127.
 (It might be best to confine oneself to the range 1-239.)
@@ -54,6 +58,14 @@ None.
 .SH BUGS
 The keycodes of X have nothing to do with those of Linux.
 Unusual keys can be made visible under Linux, but not under X.
+
+.B setkeycodes
+affects only the "first" input device
+that has modifiable scancode-to-keycode mapping.
+If there is more than one such device,
+.B setkeycodes
+cannot change the mapping of other devices than the "first" one.
+
 .SH "SEE ALSO"
 .I "dumpkeys (1), loadkeys (1), showkey (1), getkeycodes (8)"
 

kbd-1.15-po.patch:

--- NEW FILE kbd-1.15-po.patch ---
diff -up kbd-1.15/po/Makefile.in_old kbd-1.15/po/Makefile.in
--- kbd-1.15/po/Makefile.in_old	2008-10-23 21:03:59.000000000 +0200
+++ kbd-1.15/po/Makefile.in	2008-12-09 15:35:58.000000000 +0100
@@ -4,10 +4,10 @@ srcdir = @srcdir@
 
 prefix        = @prefix@
 datarootdir   = @datarootdir@
-datadir       = @datadir@
-localedir     = $(DESTDIR)$(datadir)/locale
-gnulocaledir  = $(DESTDIR)$(datadir)/locale
-gettextsrcdir = $(DESTDIR)$(datadir)/gettext/po
+datadir       = $(DESTDIR)@datadir@
+localedir     = $(DESTDIR)@localedir@
+gnulocaledir  = $(DESTDIR)@localedir@
+gettextsrcdir = $(datadir)/gettext/po
 
 FOREIGN       = @FOREIGN@
 HAVE_XGETTEXT = @HAVE_XGETTEXT@
@@ -36,10 +36,10 @@ INCLUDES = -I.. -I$(INTL)
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 
 # Enter here all .po files
-POFILES =  cs.po da.po de.po el.po es.po fr.po gr.po nl.po pl.po \
+POFILES =  cs.po da.po de.po el.po es.po fr.po nl.po pl.po \
  ro.po ru.po sv.po tr.po
 # the same but with .gmo
-GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo gr.gmo nl.gmo \
+GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo nl.gmo \
  pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo
 
 CATALOGS = $(GMOFILES)

kbd-1.15-resizecon-x86_64.patch:

--- NEW FILE kbd-1.15-resizecon-x86_64.patch ---
diff -up kbd-1.15/configure_old kbd-1.15/configure
--- kbd-1.15/configure_old	2009-01-08 15:11:04.000000000 +0100
+++ kbd-1.15/configure	2009-01-08 15:11:45.000000000 +0100
@@ -7637,8 +7637,9 @@ fi
 
 
 case $host_cpu in
-	i?86*) RESIZECONS_PROGS=yes ;;
-	*)     RESIZECONS_PROGS=no ;;
+	i?86*)   RESIZECONS_PROGS=yes ;;
+	x86_64*) RESIZECONS_PROGS=yes ;;
+	*)       RESIZECONS_PROGS=no ;;
 esac
  if test "$RESIZECONS_PROGS" = "yes"; then
   RESIZECONS_PROGS_TRUE=

kbd-1.15-sparc.patch:

--- NEW FILE kbd-1.15-sparc.patch ---
diff -up kbd-1.15/man/man8/kbdrate.8_old kbd-1.15/man/man8/kbdrate.8
--- kbd-1.15/man/man8/kbdrate.8_old	2008-12-10 14:20:33.000000000 +0100
+++ kbd-1.15/man/man8/kbdrate.8	2008-12-10 14:41:10.000000000 +0100
@@ -22,7 +22,7 @@ Using
 without any options will reset the repeat rate to 10.9 characters per second (cps)
 and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems.
 These are the IBM defaults. On SPARC-based systems it will reset the repeat rate
-to 5 cps and the delay to 200 ms.
+to 20 cps and the delay to 200 ms.
 
 .SH OPTIONS
 .TP
@@ -69,3 +69,5 @@ When these ioctls fail an ioport interfa
 .I /etc/rc.local
 .br
 .I /dev/port
+.br
+.I /dev/kbd
diff -up kbd-1.15/src/kbdrate.c_old kbd-1.15/src/kbdrate.c
--- kbd-1.15/src/kbdrate.c_old	2008-12-10 14:00:25.000000000 +0100
+++ kbd-1.15/src/kbdrate.c	2008-12-10 14:20:11.000000000 +0100
@@ -77,7 +77,6 @@ beats rebuilding the kernel!
 
 #ifdef __sparc__
 #include <asm/param.h>
-#include <asm/kbio.h>
 #endif
 
 #ifndef KDKBDREP
@@ -109,11 +108,15 @@ static int valid_delays[] = { 250, 500, 
 
 static int
 KDKBDREP_ioctl_ok(double rate, int delay, int silent) {
+#if defined(KDKBDREP) && !defined(__sparc__)
 	/*
 	 * This ioctl is defined in <linux/kd.h> but is not
 	 * implemented anywhere - must be in some m68k patches.
+         * We cannot blindly try unimplemented ioctls on sparc64 -
+         * the 32<->64bit transition layer does not like it.
 	 * Since 2.4.9 also on i386.
-	 */
+         */
+
 	struct my_kbd_repeat kbdrep_s;
 
 	/* don't change, just test */
@@ -177,6 +180,9 @@ KDKBDREP_ioctl_ok(double rate, int delay
 			rate, kbdrep_s.delay );
 
 	return 1;			/* success! */
+#else /* no KDKBDREP or __sparc__ */
+        return 0;
+#endif /* KDKBDREP */
 }
 
 static int
@@ -221,7 +227,7 @@ sigalrmhandler( int sig ) {
 int
 main( int argc, char **argv ) {
 #ifdef __sparc__
-	double      rate = 5.0;      /* Default rate */
+        double      rate = 20.0;      /* Default rate */
 	int         delay = 200;     /* Default delay */
 #else
 	double      rate = 10.9;     /* Default rate */
@@ -272,7 +278,9 @@ main( int argc, char **argv ) {
 
 
 	/* The ioport way */
+        /* The ioport way - will crash on sparc */
 
+#ifndef __sparc__
 	for (i = 0; i < RATE_COUNT; i++)
 		if (rate * 10 >= valid_rates[i]) {
 			value &= 0x60;
@@ -335,5 +343,7 @@ main( int argc, char **argv ) {
 			valid_rates[value & 0x1f] / 10.0,
 			valid_delays[ (value & 0x60) >> 5 ] );
 
+#endif
+
 	return 0;
 }
diff -up kbd-1.15/src/setleds.c_old kbd-1.15/src/setleds.c
--- kbd-1.15/src/setleds.c_old	2008-12-10 14:00:02.000000000 +0100
+++ kbd-1.15/src/setleds.c	2008-12-10 14:00:16.000000000 +0100
@@ -14,10 +14,6 @@
 #include "nls.h"
 #include "version.h"
 
-#ifdef __sparc__
-#include <asm/kbio.h>
-#endif
-
 static void
 usage(void)
 {

kbd-1.15-unicode_start.patch:

--- NEW FILE kbd-1.15-unicode_start.patch ---
diff -up kbd-1.15/src/unicode_start_old kbd-1.15/src/unicode_start
--- kbd-1.15/src/unicode_start_old	2009-01-08 13:34:10.000000000 +0100
+++ kbd-1.15/src/unicode_start	2009-01-08 14:02:12.000000000 +0100
@@ -72,6 +72,9 @@ stty iutf8
 # have a Unicode map attached, or explicitly specified, e.g.,
 # by giving `def.uni' as a second argument.
 
+DEFAULT_UNICODE_FONT=latarcyrheb-sun16
+# Also drdos8x16 is a good candidate.
+
 case "$#" in
 	2)
 		setfont "$1" -u "$2"
@@ -80,6 +83,7 @@ case "$#" in
 		setfont "$1"
 		;;
 	0)
+		setfont $DEFAULT_UNICODE_FONT
 		;;
 	*)
 		echo "usage: unicode_start [font [unicode map]]"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	10 Dec 2007 15:45:17 -0000	1.11
+++ .cvsignore	8 Jan 2009 14:46:00 -0000	1.12
@@ -8,3 +8,4 @@
 ro_maps.tar.bz2
 terminus.tar.bz2
 kbd-1.13wip.tar.gz
+kbd-1.15.tar.gz


Index: kbd.spec
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kbd.spec	18 Sep 2008 10:25:02 -0000	1.55
+++ kbd.spec	8 Jan 2009 14:46:00 -0000	1.56
@@ -1,38 +1,27 @@
-Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
-Name: kbd
-Version: 1.12
-Release: 32%{?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: kbd-latsun-fonts.tar.bz2
-Source3: kbd-sun12x22-fixed.tar.bz2
-Source4: ro_maps.tar.bz2
-Source5: terminus.tar.bz2
-Source6: kbd-latarcyrheb-16-fixed.tar.bz2
-BuildRequires: bison, flex, gettext
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: kbd-1.12-sparc.patch
-Patch1: kbd-1.08-compose.patch
-Patch2: kbd-1.08-terminal.patch
-Patch3: kbd-1.08-rukbd.patch
-Patch4: kbd-1.12-setfont-man.patch
-Patch5: kbd-1.12-Meta_utf8.patch
-Patch6: kbd-1.12-nostrip.patch
-Patch7: kbd-1.12-alias.patch
-Patch8: kbd-1.12-dir.patch
-Patch9: kbd-1.12-no-user-map.patch
-Patch10: kbd-1.12-gr-el.patch
-Patch11: kbd-1.12-keycodes-man.patch
-Patch12: kbd-1.12-resizecon-x86.patch
-Patch13: kbd-1.12-trq-map.patch
-Obsoletes: console-tools open
-Provides: console-tools open
-Conflicts: util-linux < 2.11r-9
-Prereq: initscripts >= 5.86-1
-ExcludeArch: s390 s390x
+Name:           kbd
+Version:        1.15
+Release:        1%{?dist}
+Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
+
+Group:          System Environment/Base
+License:        GPLv2+
+Source0:        http://ftp.altlinux.org/pub/people/legion/kbd/kbd-%{version}.tar.gz
+Source1:        kbd-latsun-fonts.tar.bz2
+Source2:        ro_maps.tar.bz2
+Source3:        kbd-latarcyrheb-16-fixed.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         kbd-1.15-po.patch
+Patch1:         kbd-1.15-keycodes-man.patch
+Patch2:         kbd-1.15-sparc.patch
+Patch3:         kbd-1.15-unicode_start.patch
+Patch4:         kbd-1.15-resizecon-x86_64.patch
+
+BuildRequires:  bison, flex, gettext
+Obsoletes:      console-tools open
+Provides:       console-tools open
+Conflicts:      util-linux < 2.11r-9
+Prereq:         initscripts >= 5.86-1
+ExcludeArch:    s390 s390x
 
 %description
 The %{name} package contains tools for managing a Linux
@@ -40,21 +29,12 @@
 fonts, the virtual terminals and font files.
 
 %prep
-%setup -q -a 2 -a 3 -a 4 -a 5 -a 6
-%patch0 -p1 -b .sparc
-%patch1 -p1 -b .compose
-%patch2 -p1 -b .terminal
-%patch3 -p1 -b .rukbd
-%patch4 -p1 -b .man
-%patch5 -p1 -b .Meta_utf8
-%patch6 -p1 -b .nostrip
-%patch7 -p1 -b .alias
-%patch8 -p1 -b .dir
-%patch9 -p1 -b .no-user-map
-%patch10 -p1 -b .gr-el
-%patch11 -p1 -b .keycodes-man
-%patch12 -p1 -b .resizecon-x86
-%patch13 -p1 -b .trq-map
+%setup -q -a 1 -a 2 -a 3
+%patch0 -p1 -b .po
+%patch1 -p1 -b .keycodes-man
+%patch2 -p1 -b .sparc
+%patch3 -p1 -b .unicode_start
+%patch4 -p1 -b .resizecon_x86_64
 
 # 7-bit maps are obsolete; so are non-euro maps
 pushd data/keymaps/i386
@@ -69,30 +49,17 @@
 cp azerty/fr-latin9.map azerty/fr-latin0.map # legacy alias
 popd
 
-# Default to latarcyrheb-sun16 font for unicode
-perl -pi -e 's/LatArCyrHeb-16/latarcyrheb-sun16/' src/unicode_start
-
 %build
-export OLD_PO_FILE_INPUT=yes
-
-# 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=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir}
-
-make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-static"
+%configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir} --localedir=/usr/share/locale --enable-nls
+make %{?_smp_mflags} LDFLAGS="-static"
 mv src/loadkeys src/loadkeys.static
 make clean
-./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.
-make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
+%configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir} --localedir=/usr/share/locale --enable-nls
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-# Basic install.
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # ro_win.map.gz is useless
@@ -106,13 +73,14 @@
 ln -s us.map.gz $RPM_BUILD_ROOT/lib/kbd/keymaps/i386/qwerty/ko.map.gz
 
 # Move binaries which we use before /usr is mounted from %{_bindir} to /bin.
+mkdir -p $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
+  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
+        $RPM_BUILD_ROOT/bin/unicode_start
 
 # Link open to openvt
 ln -s openvt $RPM_BUILD_ROOT%{_bindir}/open
@@ -123,20 +91,20 @@
 %find_lang %{name}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%triggerun -- kbd < 1.08-10.2
-/sbin/chkconfig --del keytable || :
+rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root)
-%doc CHANGES CREDITS README doc/kbd.FAQ*.html doc/font-formats/*.html doc/utf/utf*
+%defattr(-,root,root,-)
+%doc ChangeLog AUTHORS README doc/kbd.FAQ*.html doc/font-formats/*.html doc/utf/utf*
 /bin/*
 %{_bindir}/*
 %{_mandir}/*/*
 /lib/kbd
 
 %changelog
+* Thu Jan  8 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.15-1
+- Update to kbd-1.15
+
 * Mon Sep  8 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.12-32
 - Rediff all patches to work with patch --fuzz=0
 - Add static loadkeys
@@ -266,7 +234,7 @@
 
 * Sat Feb 19 2005 Miloslav Trmac <mitr at redhat.com> - 1.12-4
 - Don't ship a patch backup file
-- Mention in setfont.8 that 512-glyph fonts reduce the number of available 
+- Mention in setfont.8 that 512-glyph fonts reduce the number of available
   colors (#140935, patch by Dmitry Butskoj)
 - Remove "Meta_acute" from German keymaps (#143124)
 - Make the %%triggerun script condition more precise, ignore failure of the
@@ -287,6 +255,9 @@
 * Wed Jan 14 2004 Bill Nottingham <notting at redhat.com> 1.08-12
 - remove speakup patch at request of author
 
+* Wed Jan 14 2004 Bill Nottingham <notting at redhat.com> 1.08-12
+- remove speakup patch at request of author
+
 * Fri Oct 10 2003 Bill Nottingham <notting at redhat.com> 1.08-11
 - remove keytable init script (#106783)
 
@@ -354,7 +325,7 @@
 - add back lat[02]-sun16 fonts plus latarcyrheb-sun16 font
 
 * Thu Aug 22 2002 Karsten Hopp <karsten at redhat.de>
-- needs to conflict with older util-linux packages 
+- needs to conflict with older util-linux packages
   (kbdrate moved between packages)
 
 * Tue Aug 13 2002 Bill Nottingham <notting at redhat.com> 1.06-21


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Feb 2008 09:58:17 -0000	1.14
+++ sources	8 Jan 2009 14:46:00 -0000	1.15
@@ -1,6 +1,4 @@
-069d1175b4891343b107a8ac2b4a39f6  kbd-1.12.tar.bz2
 050e1e454e9c01e22f198303d649efb8  kbd-latsun-fonts.tar.bz2
-e56c7766760c16d4c7cbc16fc722c7f9  kbd-sun12x22-fixed.tar.bz2
 06ac1d4a6c014f6de9a29222497d70c8  ro_maps.tar.bz2
-0d894c1c024f531eb6d247ecc2bc4523  terminus.tar.bz2
 884fdbb0b952b2e3e8389a0c40a3e301  kbd-latarcyrheb-16-fixed.tar.bz2
+ba3fd20e6c79e58422c3cc6b28718939  kbd-1.15.tar.gz


--- kbd-1.08-compose.patch DELETED ---


--- kbd-1.08-rukbd.patch DELETED ---


--- kbd-1.08-terminal.patch DELETED ---


--- kbd-1.12-Meta_utf8.patch DELETED ---


--- kbd-1.12-alias.patch DELETED ---


--- kbd-1.12-dir.patch DELETED ---


--- kbd-1.12-gr-el.patch DELETED ---


--- kbd-1.12-keycodes-man.patch DELETED ---


--- kbd-1.12-no-user-map.patch DELETED ---


--- kbd-1.12-nostrip.patch DELETED ---


--- kbd-1.12-resizecon-x86.patch DELETED ---


--- kbd-1.12-setfont-man.patch DELETED ---


--- kbd-1.12-sparc.patch DELETED ---


--- kbd-1.12-trq-map.patch DELETED ---


--- kbd-1.12.tar.bz2.sign DELETED ---


