diff --git a/kbd-1.15.2-chvt-userwait.patch b/kbd-1.15.2-chvt-userwait.patch index cce1063..a5e5580 100644 --- a/kbd-1.15.2-chvt-userwait.patch +++ b/kbd-1.15.2-chvt-userwait.patch @@ -8,8 +8,8 @@ which repeatedly tries changing the terminal until the change has taken place. Index: kbd-1.14.1/man/man1/chvt.1 =================================================================== ---- kbd-1.14.1.orig/man/man1/chvt.1 -+++ kbd-1.14.1/man/man1/chvt.1 +--- kbd-1.14.1.orig/docs/man/man1/chvt.1 ++++ kbd-1.14.1/docs/man/man1/chvt.1 @@ -4,6 +4,9 @@ chvt \- change foreground virtual terminal .SH SYNOPSIS diff --git a/kbd-1.15.2-docu-X11R6-xorg.patch b/kbd-1.15.2-docu-X11R6-xorg.patch index 06d61fe..eec8de5 100644 --- a/kbd-1.15.2-docu-X11R6-xorg.patch +++ b/kbd-1.15.2-docu-X11R6-xorg.patch @@ -1,5 +1,5 @@ ---- kbd-1.12/doc/kbd.FAQ-15.html.orig 2003-09-24 23:01:40.000000000 +0200 -+++ kbd-1.12/doc/kbd.FAQ-15.html 2006-08-11 12:10:06.000000000 +0200 +--- docs/doc/kbd.FAQ-15.html.orig 2012-02-27 13:27:11.000000000 +0300 ++++ docs/doc/kbd.FAQ-15.html 2013-07-30 18:56:43.697000005 +0300 @@ -188,7 +188,7 @@

XFree86 also supports Slow Keys, Repeat Keys, Bounce Keys and an audible bell. xkbcomp can be used to generate a .xkm file @@ -9,8 +9,8 @@ Unfortunately, the exact process is still undocumented.

---- kbd-1.12/doc/kbd.FAQ.txt.orig 1999-10-08 22:46:24.000000000 +0200 -+++ kbd-1.12/doc/kbd.FAQ.txt 2006-08-11 12:10:16.000000000 +0200 +--- docs/doc/kbd.FAQ.txt.orig 2012-02-27 13:27:11.000000000 +0300 ++++ docs/doc/kbd.FAQ.txt 2013-07-30 18:57:41.150000005 +0300 @@ -1253,7 +1253,7 @@ 1. The Linux keyboard driver mechanism, used in conjunction with loadkeys. @@ -20,8 +20,8 @@ See also Andrew D. Balsa's comments at http://wauug.erols.com/~balsa/linux/deadkeys/index.html. ---- kbd-1.12/doc/kbd.FAQ-8.html.orig 2003-09-24 23:01:40.000000000 +0200 -+++ kbd-1.12/doc/kbd.FAQ-8.html 2006-08-11 12:09:53.000000000 +0200 +--- docs/doc/kbd.FAQ-8.html.orig 2012-02-27 13:27:11.000000000 +0300 ++++ docs/doc/kbd.FAQ-8.html 2013-07-30 18:58:23.978000004 +0300 @@ -154,7 +154,7 @@
  1. The Linux keyboard driver mechanism, used in conjunction with loadkeys.
    2. diff --git a/kbd-1.15.2-dumpkeys-ppc.patch b/kbd-1.15.2-dumpkeys-ppc.patch deleted file mode 100644 index c8f9e44..0000000 --- a/kbd-1.15.2-dumpkeys-ppc.patch +++ /dev/null @@ -1,71 +0,0 @@ -XXX: this has been reverted upstream with the comment: - - Revert "[SYSTEM] Apply patch from SUSE." - - This is an old mistake. No, 0 is not a valid keycode. - It is used by the kernel for bookkeeping purposes. - It must not be used as keycode. - - Andries - - This reverts commit 49ce531d1c70017113540318b24b9d645d170773. - - Signed-off-by: Andries Brouwer - Signed-off-by: Alexey Gladkov ---- - src/dumpkeys.c | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -Index: kbd-1.15.2/src/dumpkeys.c -=================================================================== ---- kbd-1.15.2.orig/src/dumpkeys.c -+++ kbd-1.15.2/src/dumpkeys.c -@@ -165,6 +165,10 @@ valid_type(int t) { - ke.kb_index = 0; - ke.kb_table = 0; - ke.kb_value = K(t, 0); -+#if defined(__mc68000__) || defined(__powerpc__) -+ /* Keycode 0 is a valid keycode, do not clobber it. */ -+ ioctl(fd, KDGKBENT, (unsigned long)&ke); -+#endif - status = (ioctl(fd, KDSKBENT, (unsigned long)&ke) == 0); - return status; - } -@@ -269,8 +273,13 @@ static void - show_short_info(void) { - int i; - -+#if !defined(__mc68000__) && !defined(__powerpc__) - printf(_("keycode range supported by kernel: 1 - %d\n"), - nr_keys - 1); -+#else -+ printf(_("keycode range supported by kernel: 0 - %d\n"), -+ NR_KEYS - 1); -+#endif - printf(_("max number of actions bindable to a key: %d\n"), - MAX_NR_KEYMAPS); - get_keymaps(); -@@ -383,7 +392,11 @@ dump_keys(char table_shape, char numeric - for (j = 0; j < MAX_NR_KEYMAPS; j++) { - int ja = (j | M_ALT); - if (j != ja && keymap_index[j] >= 0 && keymap_index[ja] >= 0) -+#if !defined(__mc68000__) && !defined(__powerpc__) - for (i = 1; i < nr_keys; i++) { -+#else -+ for (i = 0; i < nr_keys; i++) { -+#endif - int buf0, buf1, type; - - buf0 = get_bind(i, j); -@@ -411,7 +424,11 @@ dump_keys(char table_shape, char numeric - not_alt_is_meta: - - no_shorthands: -+#if !defined(__mc68000__) && !defined(__powerpc__) - for (i = 1; i < nr_keys; i++) { -+#else -+ for (i = 0; i < nr_keys; i++) { -+#endif - for (j = 0; j < keymapnr; j++) - buf[j] = get_bind(i, good_keymap[j]); - if (buf[0] == -1) diff --git a/kbd-1.15.5-repack.tar.bz2 b/kbd-1.15.5-repack.tar.bz2 deleted file mode 100644 index 00d41d0..0000000 --- a/kbd-1.15.5-repack.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5845caadfc9322a6574381c2909b38981d1f885f1122ef4f0b0f4a3dca0526b7 -size 1128691 diff --git a/kbd-1.15.5.tar.gz b/kbd-1.15.5.tar.gz deleted file mode 100644 index 9a1e6bd..0000000 --- a/kbd-1.15.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e35fa29f690dbbfb721706b2c8edc760c697640904fec65e81194ae8840c5c62 -size 1730719 diff --git a/kbd-2.0.1-repack.tar.bz2 b/kbd-2.0.1-repack.tar.bz2 new file mode 100644 index 0000000..c8bbc29 --- /dev/null +++ b/kbd-2.0.1-repack.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c01b917ae619e4051c6d78d196e6005620b1c82214557e2a7b51057dfe72029 +size 1369604 diff --git a/kbd-2.0.1.tar.xz b/kbd-2.0.1.tar.xz new file mode 100644 index 0000000..096a506 --- /dev/null +++ b/kbd-2.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55407b79e90ee65cdbaff7d3dafd2b53c4fee3a645788ffb582091074a2254af +size 951132 diff --git a/kbd.changes b/kbd.changes index 0d04464..bee6232 100644 --- a/kbd.changes +++ b/kbd.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Sun Nov 3 17:51:09 UTC 2013 - dap.darkness@gmail.com + +- Update to version 2.0.1: + * Disable arch-specific tests. + * Fix regression in processing alt_is_meta keyword. + * Rename Bepo keymaps: + dvorak-fr-bepo.map -> fr-bepo-latin9.map + dvorak-fr-bepo-utf8.map -> fr-bepo.map. +- Deleted kbd-1.15.2-dumpkeys-ppc.patch as obsolete: + http://lists.opensuse.org/opensuse-factory/2013-08/msg00347.html +- gcc 4.6+ became required to prevent compilling error: + "expected declaration specifiers or '...' before 'va_list'". + +------------------------------------------------------------------- +Mon Aug 19 18:27:19 UTC 2013 - dap.darkness@gmail.com + +- Update to version 2.0.0: + * Add bepo keyboard layout; + * Add libkeymap; + * The loadkeys and dumpkeys always use the libkeymap. +- Updated patches because of docs moved: + * kbd-1.15.2-chvt-userwait.patch + * kbd-1.15.2-docu-X11R6-xorg.patch +- Disabled patches because of dumpkeys rewritten: + * kbd-1.15.2-dumpkeys-C-opt.patch + * kbd-1.15.2-dumpkeys-ppc.patch + ------------------------------------------------------------------- Thu Apr 4 15:57:45 UTC 2013 - meissner@suse.com diff --git a/kbd.spec b/kbd.spec index 4c43a15..7f959d9 100644 --- a/kbd.spec +++ b/kbd.spec @@ -17,7 +17,7 @@ Name: kbd -Version: 1.15.5 +Version: 2.0.1 Release: 0 Summary: Keyboard and Font Utilities License: GPL-2.0+ @@ -25,7 +25,7 @@ Group: System/Console # git: git://git.altlinux.org/people/legion/packages/kbd.git Url: ftp://ftp.altlinux.org/pub/people/legion/kbd/ %if 0 -Source: %{name}-%{version}.tar.gz +Source: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz %else Source: %{name}-%{version}-repack.tar.bz2 %endif @@ -43,18 +43,22 @@ Source13: guess_encoding.pl Source42: convert-kbd-mac.sed Source43: repack_kbd.sh Patch0: kbd-1.15.2-prtscr_no_sigquit.patch -Patch1: kbd-1.15.2-dumpkeys-ppc.patch Patch2: kbd-1.15.2-unicode_scripts.patch Patch3: kbd-1.15.2-docu-X11R6-xorg.patch Patch4: kbd-1.15.2-sv-latin1-keycode10.patch Patch5: kbd-1.15.2-setfont-no-cruft.patch +# TODO: no ideas how to port it. Patch6: kbd-1.15.2-dumpkeys-C-opt.patch Patch8: kbd-1.15.2-chvt-userwait.patch BuildRequires: automake BuildRequires: bison +BuildRequires: check-devel BuildRequires: flex +BuildRequires: gcc >= 4.6 BuildRequires: pam-devel +BuildRequires: pkg-config +BuildRequires: xz Requires(pre): %fillup_prereq Recommends: fbset @@ -81,12 +85,12 @@ Authors: %prep %setup -q -a 1 -a 2 -n kbd-%{version} %patch0 -p1 -%patch1 -p1 %patch2 -%patch3 -p1 +%patch3 %patch4 -p1 %patch5 -p1 -%patch6 +# TODO: no ideas how to port it. +# %%patch6 %patch8 -p1 %build @@ -136,8 +140,8 @@ make DESTDIR=%{buildroot} DATA_DIR=%{kbd} MAN_DIR=%{_mandir} install # ln -s iso01-12x22.psfu $K/consolefonts/suse12x22.psfu install -m 644 data/consolefonts/README* $DOC/fonts/ mkdir -p $DOC/doc/ -install -m 644 doc/keysyms.h.info doc/kbd.FAQ.txt doc/kbd.FAQ*.html doc/README* doc/TODO $DOC/doc/ -install -m 644 doc/as400.kbd doc/console.docs doc/repeat/set_kbd_repeat-2 $DOC/doc/ +install -m 644 docs/doc/keysyms.h.info docs/doc/kbd.FAQ.txt docs/doc/kbd.FAQ*.html docs/doc/README* docs/doc/TODO $DOC/doc/ +install -m 644 docs/doc/as400.kbd docs/doc/console.docs docs/doc/repeat/set_kbd_repeat-2 $DOC/doc/ echo "See /usr/share/i18/charmaps for a description of char maps" >$DOC/doc/README.charmaps install -m 644 COPYING ChangeLog CREDITS README $DOC/ install -m 644 %{SOURCE3} $DOC/