[kbd] Update to kbd-1.15.2
vcrhonek
vcrhonek at fedoraproject.org
Wed Jan 5 13:40:45 UTC 2011
commit c22c104c459e79e5491ab8700cf55231272d41d4
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date: Wed Jan 5 14:40:22 2011 +0100
Update to kbd-1.15.2
.gitignore | 2 +
kbd-1.15-keycodes-man.patch | 26 ++++++++--------
kbd-1.15-po.patch | 43 +++++++-------------------
kbd-1.15-quiet_doc.patch | 34 ---------------------
kbd-1.15-resizecon-x86_64.patch | 8 ++--
kbd-1.15-sparc.patch | 62 +++++++++++---------------------------
kbd-1.15-unicode_start.patch | 6 ++--
kbd.spec | 32 ++++++++++++++------
sources | 4 +-
9 files changed, 76 insertions(+), 141 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5c41c84..0990291 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ ro_maps.tar.bz2
terminus.tar.bz2
kbd-1.13wip.tar.gz
kbd-1.15.tar.gz
+/kbd-1.15.2.tar.bz2
+/kbd-1.15.2.tar.bz2.sign
diff --git a/kbd-1.15-keycodes-man.patch b/kbd-1.15-keycodes-man.patch
index d18a8c8..cafa6f1 100644
--- a/kbd-1.15-keycodes-man.patch
+++ b/kbd-1.15-keycodes-man.patch
@@ -1,6 +1,6 @@
-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
+diff -up kbd-1.15.2/man/man1/showkey.1.orig kbd-1.15.2/man/man1/showkey.1
+--- kbd-1.15.2/man/man1/showkey.1.orig 2009-10-09 17:26:13.000000000 +0200
++++ kbd-1.15.2/man/man1/showkey.1 2011-01-05 12:45:25.726030798 +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
@@ -21,21 +21,21 @@ diff -up kbd-1.15/man/man1/showkey.1_old kbd-1.15/man/man1/showkey.1
.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
+diff -up kbd-1.15.2/man/man8/setkeycodes.8.orig kbd-1.15.2/man/man8/setkeycodes.8
+--- kbd-1.15.2/man/man8/setkeycodes.8.orig 2009-10-09 17:26:13.000000000 +0200
++++ kbd-1.15.2/man/man8/setkeycodes.8 2011-01-05 12:47:46.894739942 +0100
+@@ -38,6 +38,10 @@ to showkey(1), the command
+ .RE
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.
+ .LP
+ Some older kernels might hardwire a low scancode range to the
+ equivalent keycodes; setkeycodes will fail when you try to remap
+@@ -56,6 +60,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.
diff --git a/kbd-1.15-po.patch b/kbd-1.15-po.patch
index 0221f60..0bba764 100644
--- a/kbd-1.15-po.patch
+++ b/kbd-1.15-po.patch
@@ -1,31 +1,12 @@
-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)
+diff -up kbd-1.15.2/po/Makefile.in.in.orig kbd-1.15.2/po/Makefile.in.in
+--- kbd-1.15.2/po/Makefile.in.in.orig 2010-04-10 23:34:12.000000000 +0200
++++ kbd-1.15.2/po/Makefile.in.in 2011-01-05 12:34:33.182143154 +0100
+@@ -23,7 +23,7 @@ VPATH = @srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = @localedir@
+ gettextsrcdir = $(datadir)/gettext/po
+
+ INSTALL = @INSTALL@
diff --git a/kbd-1.15-resizecon-x86_64.patch b/kbd-1.15-resizecon-x86_64.patch
index 5e8350a..e926ebd 100644
--- a/kbd-1.15-resizecon-x86_64.patch
+++ b/kbd-1.15-resizecon-x86_64.patch
@@ -1,7 +1,7 @@
-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
+diff -up kbd-1.15.2/configure.orig kbd-1.15.2/configure
+--- kbd-1.15.2/configure.orig 2011-01-05 13:30:25.826147638 +0100
++++ kbd-1.15.2/configure 2011-01-05 13:31:15.089526084 +0100
+@@ -7369,8 +7369,9 @@ fi
case $host_cpu in
diff --git a/kbd-1.15-sparc.patch b/kbd-1.15-sparc.patch
index a858a25..68de519 100644
--- a/kbd-1.15-sparc.patch
+++ b/kbd-1.15-sparc.patch
@@ -1,6 +1,6 @@
-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
+diff -up kbd-1.15.2/man/man8/kbdrate.8.orig kbd-1.15.2/man/man8/kbdrate.8
+--- kbd-1.15.2/man/man8/kbdrate.8.orig 2009-06-07 21:48:42.000000000 +0200
++++ kbd-1.15.2/man/man8/kbdrate.8 2011-01-05 12:58:34.579706016 +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.
@@ -16,18 +16,10 @@ diff -up kbd-1.15/man/man8/kbdrate.8_old kbd-1.15/man/man8/kbdrate.8
.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,
+diff -up kbd-1.15.2/src/kbdrate.c.orig kbd-1.15.2/src/kbdrate.c
+--- kbd-1.15.2/src/kbdrate.c.orig 2011-01-05 12:53:45.186575833 +0100
++++ kbd-1.15.2/src/kbdrate.c 2011-01-05 12:57:37.746753646 +0100
+@@ -108,9 +108,12 @@ static int valid_delays[] = { 250, 500,
static int
KDKBDREP_ioctl_ok(double rate, int delay, int silent) {
@@ -35,45 +27,41 @@ diff -up kbd-1.15/src/kbdrate.c_old kbd-1.15/src/kbdrate.c
/*
* 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.
++ * 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
+@@ -176,6 +179,9 @@ KDKBDREP_ioctl_ok(double rate, int delay
rate, kbdrep_s.delay );
return 1; /* success! */
+#else /* no KDKBDREP or __sparc__ */
-+ return 0;
++ return 0;
+#endif /* KDKBDREP */
}
- static int
-@@ -221,7 +227,7 @@ sigalrmhandler( int sig ) {
+ #ifndef KIOCSRATE
+@@ -226,7 +232,7 @@ sigalrmhandler( attr_unused int sig ) {
int
main( int argc, char **argv ) {
#ifdef __sparc__
- double rate = 5.0; /* Default rate */
-+ double rate = 20.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 ) {
+@@ -277,7 +283,9 @@ main( int argc, char **argv ) {
/* The ioport way */
-+ /* The ioport way - will crash on sparc */
++ /* 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 ) {
+@@ -340,5 +348,7 @@ main( int argc, char **argv ) {
valid_rates[value & 0x1f] / 10.0,
valid_delays[ (value & 0x60) >> 5 ] );
@@ -81,17 +69,3 @@ diff -up kbd-1.15/src/kbdrate.c_old kbd-1.15/src/kbdrate.c
+
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)
- {
diff --git a/kbd-1.15-unicode_start.patch b/kbd-1.15-unicode_start.patch
index 41827cc..119fe78 100644
--- a/kbd-1.15-unicode_start.patch
+++ b/kbd-1.15-unicode_start.patch
@@ -1,6 +1,6 @@
-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
+diff -up kbd-1.15.2/src/unicode_start.orig kbd-1.15.2/src/unicode_start
+--- kbd-1.15.2/src/unicode_start.orig 2011-01-05 13:28:22.079662644 +0100
++++ kbd-1.15.2/src/unicode_start 2011-01-05 13:29:01.327353698 +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.
diff --git a/kbd.spec b/kbd.spec
index 7b7064d..08c71fb 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -1,23 +1,27 @@
Name: kbd
-Version: 1.15
-Release: 11%{?dist}
+Version: 1.15.2
+Release: 1%{?dist}
Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
Group: System Environment/Base
License: GPLv2+
URL: http://ftp.altlinux.org/pub/people/legion/kbd
-Source0: http://ftp.altlinux.org/pub/people/legion/kbd/kbd-%{version}.tar.gz
-Source1: kbd-latsun-fonts.tar.bz2
-Source2: ro_maps.tar.bz2
+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-latarcyrheb-16-fixed.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Patch0: installs translation file to right place
Patch0: kbd-1.15-po.patch
+# Patch1: puts additional information into man pages
Patch1: kbd-1.15-keycodes-man.patch
+# Patch2: sparc modifications
Patch2: kbd-1.15-sparc.patch
+# Patch3: adds default unicode font to unicode_start script
Patch3: kbd-1.15-unicode_start.patch
+# Patch4: adds resizecon binary also to the x86_64 arch
Patch4: kbd-1.15-resizecon-x86_64.patch
-Patch5: kbd-1.15-quiet_doc.patch
-Patch6: kbd-1.15-defkeymap.patch
+Patch5: kbd-1.15-defkeymap.patch
BuildRequires: bison, flex, gettext
Conflicts: util-linux < 2.11r-9
@@ -38,14 +42,13 @@ The %{name}-misc package contains data for kbd package - console fonts,
keymaps etc. Please note that %{name}-misc is not helpful without kbd.
%prep
-%setup -q -a 1 -a 2 -a 3
+%setup -q -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
-%patch5 -p1 -b .quiet_doc
-%patch6 -p1 -b .defkeymap
+%patch5 -p1 -b .defkeymap
# 7-bit maps are obsolete; so are non-euro maps
pushd data/keymaps/i386
@@ -67,6 +70,11 @@ mv olpc/pt.map olpc/pt-olpc.map
mv qwerty/cz.map qwerty/cz-qwerty.map
popd
+# remove obsolete "gr" translation
+pushd po
+rm -f gr.po gr.gmo
+popd
+
# Convert to utf-8
iconv -f iso-8859-1 -t utf-8 < "ChangeLog" > "ChangeLog_"
mv "ChangeLog_" "ChangeLog"
@@ -119,6 +127,10 @@ rm -rf $RPM_BUILD_ROOT
/lib/kbd
%changelog
+* Wed Jan 5 2011 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.15.2-1
+- Update to kbd-1.15.2 (removed kbd-1.15-quiet_doc.patch and romanian keymaps, both are
+ part of the upstream tarball now)
+
* Thu Jun 24 2010 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.15-11
- Ship /lib/kbd in separate subpackage
diff --git a/sources b/sources
index 8f7944c..6f5b414 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
050e1e454e9c01e22f198303d649efb8 kbd-latsun-fonts.tar.bz2
-06ac1d4a6c014f6de9a29222497d70c8 ro_maps.tar.bz2
884fdbb0b952b2e3e8389a0c40a3e301 kbd-latarcyrheb-16-fixed.tar.bz2
-ba3fd20e6c79e58422c3cc6b28718939 kbd-1.15.tar.gz
+e850eb91e4d3b94b194efe8e953204c5 kbd-1.15.2.tar.bz2
+509b0bce718bf3cb9b631b0a69289751 kbd-1.15.2.tar.bz2.sign
More information about the scm-commits
mailing list