commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2020-10-03 18:53:50
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new.4249 (New)
Package is "kbd"
Sat Oct 3 18:53:50 2020 rev:102 rq:838620 version:2.3.0
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2020-09-23 13:01:11.901883207
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new.4249/kbd.changes2020-10-03
18:53:52.245373347 +0200
@@ -1,0 +2,45 @@
+Fri Sep 25 10:28:40 UTC 2020 - Dominique Leuenberger
+
+- Do not package libtswrap.so.0: it's only used by the test suite
+ in a LD_PRELOAD fashion.
+
+---
+Thu Sep 24 00:08:45 UTC 2020 - Stanislav Brabec
+
+- Update to version 2.3.0:
+ * Added libkfont library (internal yet).
+ * Added Canadian Multilingual Standard keyboard map.
+ * Added us1 that maps Right Alt to AltGr and Shift+Tab to
+Alt+Tab.
+ * The dead_macron is used instead of macron in fi.map.
+ * Added retries when switching to the console (chvt, openvt).
+ * Added option -d to double size of font (setfont).
+ * Added long options, help messages.
+ * Added solar24x32 font.
+ * Updated eurlatgr font.
+ * Fixed problems with formatting man pages.
+ * Fixed search path error (boo#1176854).
+- Refresh partially upstreamed kbd-1.15.2-dumpkeys-C-opt.patch
+- Drop upstreamed libkeymap-Fix-mk_mapname-for-the-plain-map.patch
+- Refresh kbd-1.15.2-setfont-no-cruft.patch and
+ kbd-1.15.5-loadkeys-search-path.patch
+
+---
+Tue Sep 22 08:45:57 UTC 2020 - Guillaume GARDET
+
+- Refresh patch to fix build on non-x86 architecture broken
+ by previous commit:
+ * kbdsettings-nox86.patch
+
+---
+Thu Sep 17 22:43:16 UTC 2020 - Stanislav Brabec
+
+- Make kbdsettings working in both bash and dash (boo#1175040).
+
+---
+Thu Sep 17 14:47:04 UTC 2020 - Stanislav Brabec
+
+- Fix kbd-1.15.5-loadkeys-search-path.patch to prefer xkb keymaps
+ (boo#1176302).
+
+---
Old:
kbd-2.2.0-repack.tar.xz
libkeymap-Fix-mk_mapname-for-the-plain-map.patch
New:
kbd-2.3.0-repack.tar.xz
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.TdrfPH/_old 2020-10-03 18:53:54.097375753 +0200
+++ /var/tmp/diff_new_pack.TdrfPH/_new 2020-10-03 18:53:54.101375758 +0200
@@ -24,16 +24,16 @@
%define legacy_folders amiga,atari,i386,include,mac,ppc,sun
Name: kbd
-Version:2.2.0
+Version:2.3.0
Release:0
Summary:Keyboard and Font Utilities
# git: git://git.altlinux.org/people/legion/packages/kbd.git
License:GPL-2.0-or-later
Group: System/Console
URL:http://kbd-project.org/
-# repack_kbd.sh on
ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-%{version}.tar.xz
+# repack_kbd.sh on
ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-%%{version}.tar.xz
# or
-# repack_kbd.sh on
ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz
+# repack_kbd.sh on
ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%%{version}.tar.xz
Source: %{name}-%{version}-repack.tar.xz
Source1:kbd_fonts.tar.bz2
Source2:suse-add.tar.bz2
@@ -56,7 +56,6 @@
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
Patch9: kbd-2.0.2-comment-typo-qwerty.patch
Patch10:kbd-2.0.2-doshell-reference.patch
@@ -69,7 +68,7 @@
Patch14:kbdsettings-nox86.patch
# PATCH-FIX-SLE kbd-unicode-fxxx.patch sbra...@suse.com bsc1085432 -- Do not
cause error on UNICODE characters >= 0xF000 (e. g. ligature fi)
Patch15:kbd-unicode-fxxx.patch
-Patch16:libkeymap-Fix-mk_mapname-for-the-plain-map.patch
+BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
BuildRequires: check-devel
@@ -77,6 +76,7 @@
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: gcc >= 4.6
+BuildRequires: libtool
BuildRequires: pam-devel
BuildRequires: pkgconfig
BuildRequires: suse-module-tools
@@ -134,7 +134,6 @@
%patch14 -p0
%endif
%patch15 -p1
-%patch16 -p1
%build
for i in `find data/keymaps/mac -type f` ; do
@@ -152,12 +151,14 @@
test -f olpc/pt.map || mv olpc/pt.map olpc/pt-olpc.map
test -f qwerty/cz.map || mv qwerty/cz.map qwerty/cz-qwerty.map
popd
+./autogen.sh
%configure
commit kbd for openSUSE:Factory
Hello community, here is the log from the commit of package kbd for openSUSE:Factory checked in at 2020-09-23 13:00:44 Comparing /work/SRC/openSUSE:Factory/kbd (Old) and /work/SRC/openSUSE:Factory/.kbd.new.4249 (New) Package is "kbd" Wed Sep 23 13:00:44 2020 rev:100 rq: version:2.2.0 Changes: --- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2020-09-23 12:59:20.217774336 +0200 +++ /work/SRC/openSUSE:Factory/.kbd.new.4249/kbd.changes2020-09-23 13:00:45.773857737 +0200 @@ -1,0 +2,679 @@ +Thu Sep 17 22:43:16 UTC 2020 - Stanislav Brabec + +- Make kbdsettings working in both bash and dash (boo#1175040). + +--- +Thu Sep 17 14:47:04 UTC 2020 - Stanislav Brabec + +- Fix kbd-1.15.5-loadkeys-search-path.patch to prefer xkb keymaps + (boo#1176302). + +--- +Thu Aug 20 11:34:32 UTC 2020 - Jiri Slaby + +- add libkeymap-Fix-mk_mapname-for-the-plain-map.patch + +--- +Tue Apr 21 13:08:11 UTC 2020 - Ludwig Nussel + +- drop broken kbd command as well as guess_encoding (boo#1170067) +- don't use subdirectory for legacy keymaps (boo#1166423) +- use fdupes + +--- +Tue Mar 3 02:25:10 CET 2020 - sbra...@suse.com + +- Update to version 2.2.0: + * setfont: Add option -d to double size of font. + * kbd_mode: Add -f option and deny dangerous mode switches +without it. + * Data files updates. + * Fix gcc warnings and error with gcc-10 (boo#1160273). + * Other fixes. + * For a full list of changes see: +https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git/log/ +- Update home page. +- Refresh patches: kbd-1.15.2-dumpkeys-C-opt.patch, + kbd-1.15.2-setfont-no-cruft.patch, + kbd-1.15.5-loadkeys-search-path.patch. + +--- +Thu Jan 9 22:35:51 UTC 2020 - Stefan Brüns + +- Use a UTF-8 capable locale, otherwise ckbcomp will not not able + to do proper uppercase/lowercase conversions. +- Rebase cz-map.patch after UTF-8 changes. +- Skip compression/decompression of maps which are about to be + discarded later (~30%). Avoid zgrep, which is a shell script + spawning grep and gunzip for each input file. + +--- +Thu Dec 5 12:15:22 UTC 2019 - ku...@suse.de + +- Move pam.d/vlock to /usr/etc + +--- +Thu Sep 19 09:05:55 UTC 2019 - Martin Vidner + +- Allow YaST to select Iranian (Persian, Farsi) keyboard layout + (bsc#1092920) + +--- +Thu Aug 2 08:06:01 UTC 2018 - sch...@suse.de + +- fbtest.c: include for major/minor + +--- +Thu May 24 16:14:57 CEST 2018 - ku...@suse.de + +- Use %license instead of %doc [bsc#1082318] + +--- +Thu Apr 5 17:32:03 CEST 2018 - sbra...@suse.com + +- Disable characters >=U+F000. These do not work properly + (bsc#1085432#c15, kbd-unicode-fxxx.patch). + +--- +Thu Mar 15 17:04:06 CET 2018 - sbra...@suse.com + +- Do not cause error on UNICODE characters >= 0xF000 (e. g. + ligature fi) (bsc#1085432, kbd-unicode-fxxx.patch). + +--- +Fri Jan 12 17:39:18 CET 2018 - sbra...@suse.com + +- Move initial NumLock handling from systemd back to kbd: + * Add kbdsettings service written by Thomas Blume (boo#1010880, +kbdsettings, kbdsettings.service, numlockbios.c, +update sysconfig.console and sysconfig.keyboard). + * Exclude numlockbios support for non x86 platforms +(kbdsettings-nox86.patch). +- Drop references to KEYTABLE and COMPOSETABLE (boo#1010880#c32, + boo#1010880#c54, sysconfig.keyboard.del, README.SUSE, + drop kbd.fillup). +- Fix paths in kbd.pl. + +--- +Wed Dec 6 13:30:49 UTC 2017 - f...@suse.com + +- Drop from some fill-up templates, a couple of sysconfig variables no + more read by systemd (fate#319454) + + So the relevant settings can be defined in only one place. + +--- +Thu Nov 23 13:40:21 UTC 2017 - rbr...@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +--- +Fri Oct 13 14:53:41 CEST 2017 - sbra...@suse.com + +- Add vlock.pamd PAM file (bsc#1056449#c8). +- Clean spec file. +
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2020-09-23 13:01:11
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new.4249 (New)
Package is "kbd"
Wed Sep 23 13:01:11 2020 rev:101 rq: version:2.2.0
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2020-09-23 13:00:45.773857737
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new.4249/kbd.changes2020-09-23
13:01:11.901883207 +0200
@@ -2,11 +1,0 @@
-Thu Sep 17 22:43:16 UTC 2020 - Stanislav Brabec
-
-- Make kbdsettings working in both bash and dash (boo#1175040).
-
-Thu Sep 17 14:47:04 UTC 2020 - Stanislav Brabec
-
-- Fix kbd-1.15.5-loadkeys-search-path.patch to prefer xkb keymaps
- (boo#1176302).
-
Other differences:
--
++ kbd-1.15.5-loadkeys-search-path.patch ++
--- /var/tmp/diff_new_pack.JZRwWJ/_old 2020-09-23 13:01:12.933884213 +0200
+++ /var/tmp/diff_new_pack.JZRwWJ/_new 2020-09-23 13:01:12.933884213 +0200
@@ -7,7 +7,7 @@
#include "keymap.h"
-static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**",
KERNDIR "/", 0 };
-+static const char *const dirpath1[] = { "", DATADIR "/" XKBKEYMAPDIR "/",
DATADIR "/" LEGACYKEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0
};
++static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**",
DATADIR "/" XKBKEYMAPDIR "/", DATADIR "/" LEGACYKEYMAPDIR "/**", KERNDIR "/", 0
};
static const char *const suffixes[] = { "", ".kmap", ".map", 0 };
static void __attribute__((noreturn))
++ kbdsettings ++
--- /var/tmp/diff_new_pack.JZRwWJ/_old 2020-09-23 13:01:12.981884260 +0200
+++ /var/tmp/diff_new_pack.JZRwWJ/_new 2020-09-23 13:01:12.981884260 +0200
@@ -7,12 +7,11 @@
for i in NUM SCR CAPS; do
conf=$(eval echo KBD_${i}LOCK)
- eval confval=\"\$$conf\"
- [ -z "$confval" ] && continue
- param=$(echo $i | tr A-Z a-z | sed 's/scr/scroll/')
+ [ -z ${!conf} ] && continue
+ param=$(echo ${i,,} | sed 's/scr/scroll/')
for tty in ${KBD_TTY:-tty1 tty2 tty3 tty4 tty5 tty6}; do
- case "$confval" in
+ case "${!conf}" in
yes)
if [ $param = "num" ]; then
touch /run/numlock-on
@@ -36,11 +35,11 @@
/usr/bin/setleds -D -$param < /dev/$tty
fi
else
- echo "Value $confval invalid for $conf"
+ echo "Value ${!conf} invalid for $conf"
fi
;;
*)
- echo "error: unknown value $confval in $conf"
+ echo "error: unknown value ${!conf} in $conf"
;;
esac
done
commit kbd for openSUSE:Factory
Hello community, here is the log from the commit of package kbd for openSUSE:Factory checked in at 2020-09-23 12:59:13 Comparing /work/SRC/openSUSE:Factory/kbd (Old) and /work/SRC/openSUSE:Factory/.kbd.new.4249 (New) Package is "kbd" Wed Sep 23 12:59:13 2020 rev:99 rq: version:1.12 Changes: --- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2020-09-21 17:08:31.131196922 +0200 +++ /work/SRC/openSUSE:Factory/.kbd.new.4249/kbd.changes2020-09-23 12:59:20.217774336 +0200 @@ -2,679 +1,0 @@ -Thu Sep 17 22:43:16 UTC 2020 - Stanislav Brabec - -- Make kbdsettings working in both bash and dash (boo#1175040). - -Thu Sep 17 14:47:04 UTC 2020 - Stanislav Brabec - -- Fix kbd-1.15.5-loadkeys-search-path.patch to prefer xkb keymaps - (boo#1176302). - -Thu Aug 20 11:34:32 UTC 2020 - Jiri Slaby - -- add libkeymap-Fix-mk_mapname-for-the-plain-map.patch - -Tue Apr 21 13:08:11 UTC 2020 - Ludwig Nussel - -- drop broken kbd command as well as guess_encoding (boo#1170067) -- don't use subdirectory for legacy keymaps (boo#1166423) -- use fdupes - -Tue Mar 3 02:25:10 CET 2020 - sbra...@suse.com - -- Update to version 2.2.0: - * setfont: Add option -d to double size of font. - * kbd_mode: Add -f option and deny dangerous mode switches -without it. - * Data files updates. - * Fix gcc warnings and error with gcc-10 (boo#1160273). - * Other fixes. - * For a full list of changes see: -https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git/log/ -- Update home page. -- Refresh patches: kbd-1.15.2-dumpkeys-C-opt.patch, - kbd-1.15.2-setfont-no-cruft.patch, - kbd-1.15.5-loadkeys-search-path.patch. - -Thu Jan 9 22:35:51 UTC 2020 - Stefan Brüns - -- Use a UTF-8 capable locale, otherwise ckbcomp will not not able - to do proper uppercase/lowercase conversions. -- Rebase cz-map.patch after UTF-8 changes. -- Skip compression/decompression of maps which are about to be - discarded later (~30%). Avoid zgrep, which is a shell script - spawning grep and gunzip for each input file. - -Thu Dec 5 12:15:22 UTC 2019 - ku...@suse.de - -- Move pam.d/vlock to /usr/etc - -Thu Sep 19 09:05:55 UTC 2019 - Martin Vidner - -- Allow YaST to select Iranian (Persian, Farsi) keyboard layout - (bsc#1092920) - -Thu Aug 2 08:06:01 UTC 2018 - sch...@suse.de - -- fbtest.c: include for major/minor - -Thu May 24 16:14:57 CEST 2018 - ku...@suse.de - -- Use %license instead of %doc [bsc#1082318] - -Thu Apr 5 17:32:03 CEST 2018 - sbra...@suse.com - -- Disable characters >=U+F000. These do not work properly - (bsc#1085432#c15, kbd-unicode-fxxx.patch). - -Thu Mar 15 17:04:06 CET 2018 - sbra...@suse.com - -- Do not cause error on UNICODE characters >= 0xF000 (e. g. - ligature fi) (bsc#1085432, kbd-unicode-fxxx.patch). - -Fri Jan 12 17:39:18 CET 2018 - sbra...@suse.com - -- Move initial NumLock handling from systemd back to kbd: - * Add kbdsettings service written by Thomas Blume (boo#1010880, -kbdsettings, kbdsettings.service, numlockbios.c, -update sysconfig.console and sysconfig.keyboard). - * Exclude numlockbios support for non x86 platforms -(kbdsettings-nox86.patch). -- Drop references to KEYTABLE and COMPOSETABLE (boo#1010880#c32, - boo#1010880#c54, sysconfig.keyboard.del, README.SUSE, - drop kbd.fillup). -- Fix paths in kbd.pl. - -Wed Dec 6 13:30:49 UTC 2017 - f...@suse.com - -- Drop from some fill-up templates, a couple of sysconfig variables no - more read by systemd (fate#319454) - - So the relevant settings can be defined in only one place. - -Thu Nov 23 13:40:21 UTC 2017 - rbr...@suse.com - -- Replace references to /var/adm/fillup-templates with new - %_fillupdir macro (boo#1069468) - -Fri Oct 13 14:53:41 CEST 2017 - sbra...@suse.com - -- Add vlock.pamd PAM file (bsc#1056449#c8). -- Clean spec file. -
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2020-09-21 17:05:53
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new.4249 (New)
Package is "kbd"
Mon Sep 21 17:05:53 2020 rev:98 rq:835310 version:2.2.0
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2020-09-10 22:47:05.139770762
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new.4249/kbd.changes2020-09-21
17:08:31.131196922 +0200
@@ -1,0 +2,11 @@
+Thu Sep 17 22:43:16 UTC 2020 - Stanislav Brabec
+
+- Make kbdsettings working in both bash and dash (boo#1175040).
+
+---
+Thu Sep 17 14:47:04 UTC 2020 - Stanislav Brabec
+
+- Fix kbd-1.15.5-loadkeys-search-path.patch to prefer xkb keymaps
+ (boo#1176302).
+
+---
Other differences:
--
++ kbd-1.15.5-loadkeys-search-path.patch ++
--- /var/tmp/diff_new_pack.GBLdCW/_old 2020-09-21 17:08:34.931200338 +0200
+++ /var/tmp/diff_new_pack.GBLdCW/_new 2020-09-21 17:08:34.935200341 +0200
@@ -7,7 +7,7 @@
#include "keymap.h"
-static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**",
KERNDIR "/", 0 };
-+static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**",
DATADIR "/" XKBKEYMAPDIR "/", DATADIR "/" LEGACYKEYMAPDIR "/**", KERNDIR "/", 0
};
++static const char *const dirpath1[] = { "", DATADIR "/" XKBKEYMAPDIR "/",
DATADIR "/" LEGACYKEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0
};
static const char *const suffixes[] = { "", ".kmap", ".map", 0 };
static void __attribute__((noreturn))
++ kbdsettings ++
--- /var/tmp/diff_new_pack.GBLdCW/_old 2020-09-21 17:08:34.967200370 +0200
+++ /var/tmp/diff_new_pack.GBLdCW/_new 2020-09-21 17:08:34.967200370 +0200
@@ -7,11 +7,12 @@
for i in NUM SCR CAPS; do
conf=$(eval echo KBD_${i}LOCK)
- [ -z ${!conf} ] && continue
- param=$(echo ${i,,} | sed 's/scr/scroll/')
+ eval confval=\"\$$conf\"
+ [ -z "$confval" ] && continue
+ param=$(echo $i | tr A-Z a-z | sed 's/scr/scroll/')
for tty in ${KBD_TTY:-tty1 tty2 tty3 tty4 tty5 tty6}; do
- case "${!conf}" in
+ case "$confval" in
yes)
if [ $param = "num" ]; then
touch /run/numlock-on
@@ -35,11 +36,11 @@
/usr/bin/setleds -D -$param < /dev/$tty
fi
else
- echo "Value ${!conf} invalid for $conf"
+ echo "Value $confval invalid for $conf"
fi
;;
*)
- echo "error: unknown value ${!conf} in $conf"
+ echo "error: unknown value $confval in $conf"
;;
esac
done
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2020-09-10 22:47:01
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new.4249 (New)
Package is "kbd"
Thu Sep 10 22:47:01 2020 rev:97 rq:832929 version:2.2.0
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2020-04-27 23:29:27.338478260
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new.4249/kbd.changes2020-09-10
22:47:05.139770762 +0200
@@ -1,0 +2,5 @@
+Thu Aug 20 11:34:32 UTC 2020 - Jiri Slaby
+
+- add libkeymap-Fix-mk_mapname-for-the-plain-map.patch
+
+---
New:
libkeymap-Fix-mk_mapname-for-the-plain-map.patch
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.eALscq/_old 2020-09-10 22:47:08.855774186 +0200
+++ /var/tmp/diff_new_pack.eALscq/_new 2020-09-10 22:47:08.859774190 +0200
@@ -69,6 +69,7 @@
Patch14:kbdsettings-nox86.patch
# PATCH-FIX-SLE kbd-unicode-fxxx.patch sbra...@suse.com bsc1085432 -- Do not
cause error on UNICODE characters >= 0xF000 (e. g. ligature fi)
Patch15:kbd-unicode-fxxx.patch
+Patch16:libkeymap-Fix-mk_mapname-for-the-plain-map.patch
BuildRequires: automake
BuildRequires: bison
BuildRequires: check-devel
@@ -133,6 +134,7 @@
%patch14 -p0
%endif
%patch15 -p1
+%patch16 -p1
%build
for i in `find data/keymaps/mac -type f` ; do
++ libkeymap-Fix-mk_mapname-for-the-plain-map.patch ++
From: Alexey Gladkov
Date: Sun, 23 Feb 2020 18:24:59 +0100
Subject: libkeymap: Fix mk_mapname for the plain map
Patch-mainline: 2.3
Git-commit: 88ae58fe8a223d11307accc36cc293133a18e7ac
mk_mapname did not correctly return "plain" for the plain map (no modifier set)
if it had already been called, as it did not correctly reset the static buffer
that it uses for the map name. When mk_mapname is called for the first time
from the first loop in lk_dump_ctable, all is fine, since buf has not been used
yet and it is initialised to 0. However, when it is called again for the plain
map from the second loop in lk_dump_ctable, buf already contains a value (left
over from the last iteration in the first loop), and then strcat appends
"plain" to that value instead of overwriting it, resulting in a bogus value.
Reported-by: Javier Pello
Signed-off-by: Alexey Gladkov
Signed-off-by: Jiri Slaby
---
src/libkeymap/dump.c| 2 +-
tests/data/dumpkeys-mktable/defkeymap.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c
index 8531b5aa3d91..d67eefaada54 100644
--- a/src/libkeymap/dump.c
+++ b/src/libkeymap/dump.c
@@ -101,7 +101,7 @@ mk_mapname(char modifier)
int i;
if (!modifier) {
- strcat(buf, "plain");
+ strcpy(buf, "plain");
return buf;
}
buf[0] = 0;
diff --git a/tests/data/dumpkeys-mktable/defkeymap.c
b/tests/data/dumpkeys-mktable/defkeymap.c
index e831316a1ff3..5d9a3aaeff8c 100644
--- a/tests/data/dumpkeys-mktable/defkeymap.c
+++ b/tests/data/dumpkeys-mktable/defkeymap.c
@@ -565,7 +565,7 @@ static unsigned short shift_altgr_ctrl_alt_map[NR_KEYS] = {
};
ushort *key_maps[MAX_NR_KEYMAPS] = {
- shift_altgr_ctrl_altplain_map, shift_map, altgr_map, shift_altgr_map,
+ plain_map, shift_map, altgr_map, shift_altgr_map,
ctrl_map, shift_ctrl_map, altgr_ctrl_map, shift_altgr_ctrl_map,
alt_map, shift_alt_map, altgr_alt_map, shift_altgr_alt_map,
ctrl_alt_map, shift_ctrl_alt_map, altgr_ctrl_alt_map,
shift_altgr_ctrl_alt_map, 0
--
2.28.0
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2020-04-27 23:29:25
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new.2738 (New)
Package is "kbd"
Mon Apr 27 23:29:25 2020 rev:96 rq:796365 version:2.2.0
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2020-03-08 22:23:39.224059555
+0100
+++ /work/SRC/openSUSE:Factory/.kbd.new.2738/kbd.changes2020-04-27
23:29:27.338478260 +0200
@@ -1,0 +2,7 @@
+Tue Apr 21 13:08:11 UTC 2020 - Ludwig Nussel
+
+- drop broken kbd command as well as guess_encoding (boo#1170067)
+- don't use subdirectory for legacy keymaps (boo#1166423)
+- use fdupes
+
+---
Old:
guess_encoding.pl
kbd.pl
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.bmVx07/_old 2020-04-27 23:29:30.218483883 +0200
+++ /var/tmp/diff_new_pack.bmVx07/_new 2020-04-27 23:29:30.222483890 +0200
@@ -21,6 +21,8 @@
%define _fillupdir /var/adm/fillup-templates
%endif
+%define legacy_folders amiga,atari,i386,include,mac,ppc,sun
+
Name: kbd
Version:2.2.0
Release:0
@@ -41,8 +43,6 @@
Source9:sysconfig.keyboard
Source11: fbtest.c
Source12: fbtest.8
-Source13: guess_encoding.pl
-Source14: kbd.pl
Source15: cz-map.patch
Source20: kbdsettings
Source21: kbdsettings.service
@@ -73,6 +73,7 @@
BuildRequires: bison
BuildRequires: check-devel
BuildRequires: console-setup
+BuildRequires: fdupes
BuildRequires: flex
BuildRequires: gcc >= 4.6
BuildRequires: pam-devel
@@ -278,8 +279,6 @@
install -d %{buildroot}%{_distconfdir}/pam.d
install -m 644 %{SOURCE4} %{buildroot}%{_distconfdir}/pam.d/vlock
install -m 644 %{SOURCE12} %{buildroot}%{_mandir}/man8/
-install -m 755 %{SOURCE13} %{buildroot}%{_bindir}/guess_encoding
-install -m 755 %{SOURCE14} %{buildroot}%{_bindir}/kbd
#UsrMerge
mkdir -p %{buildroot}/bin
mkdir -p %{buildroot}/sbin
@@ -289,7 +288,6 @@
ln -s %{_bindir}/dumpkeys %{buildroot}/bin
ln -s %{_bindir}/fgconsole %{buildroot}/bin
ln -s %{_bindir}/getunimap %{buildroot}/bin
-ln -s %{_bindir}/guess_encoding %{buildroot}/bin
ln -s %{_bindir}/kbd_mode %{buildroot}/bin
ln -s %{_bindir}/kbdinfo %{buildroot}/bin
ln -s %{_bindir}/kbdrate %{buildroot}/bin
@@ -326,10 +324,6 @@
%endif
#EndUsrMerge
-# Move original keymaps to legacy directory
-mkdir -p %{buildroot}%{kbd}/keymaps/legacy
-mv %{buildroot}%{kbd}/keymaps/{amiga,atari,i386,include,mac,ppc,sun}
%{buildroot}%{kbd}/keymaps/legacy
-
# Make sure Perl has a locale where uc/lc works for unicode codepoints
# see e.g.
https://perldoc.perl.org/perldiag.html#Wide-character-(U%2b%25X)-in-%25s
export LC_ALL=C.utf-8
@@ -373,6 +367,8 @@
install -d %{buildroot}%{_prefix}/lib/systemd/system
install -m0644 kbdsettings.service %{buildroot}%{_prefix}/lib/systemd/system
+%fdupes -s %{buildroot}%{_datadir}
+
%find_lang %{name}
%pre
@@ -412,7 +408,7 @@
%{_fillupdir}/sysconfig.console
%{_fillupdir}/sysconfig.keyboard
%{kbd}
-%exclude %{kbd}/keymaps/legacy
+%exclude %{kbd}/keymaps/{%{legacy_folders}}
#UsrMerge
/sbin/fbtest
/bin/chvt
@@ -445,7 +441,6 @@
/bin/unicode_start
/bin/unicode_stop
/bin/kbdrate
-/bin/guess_encoding
/bin/clrunimap
/bin/getunimap
/bin/outpsfheader
@@ -487,8 +482,6 @@
%{_bindir}/unicode_start
%{_bindir}/unicode_stop
%{_bindir}/kbdrate
-%{_bindir}/guess_encoding
-%{_bindir}/kbd
%{_bindir}/clrunimap
%{_bindir}/getunimap
%{_bindir}/outpsfheader
@@ -532,6 +525,6 @@
%{_sbindir}/kbdsettings
%files legacy
-%{kbd}/keymaps/legacy
+%{kbd}/keymaps/{%{legacy_folders}}
%changelog
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2020-03-08 22:23:18
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new.26092 (New)
Package is "kbd"
Sun Mar 8 22:23:18 2020 rev:95 rq:781687 version:2.2.0
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2020-01-20 22:48:30.143183277
+0100
+++ /work/SRC/openSUSE:Factory/.kbd.new.26092/kbd.changes 2020-03-08
22:23:39.224059555 +0100
@@ -1,0 +2,17 @@
+Tue Mar 3 02:25:10 CET 2020 - sbra...@suse.com
+
+- Update to version 2.2.0:
+ * setfont: Add option -d to double size of font.
+ * kbd_mode: Add -f option and deny dangerous mode switches
+without it.
+ * Data files updates.
+ * Fix gcc warnings and error with gcc-10 (boo#1160273).
+ * Other fixes.
+ * For a full list of changes see:
+https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git/log/
+- Update home page.
+- Refresh patches: kbd-1.15.2-dumpkeys-C-opt.patch,
+ kbd-1.15.2-setfont-no-cruft.patch,
+ kbd-1.15.5-loadkeys-search-path.patch.
+
+---
Old:
kbd-2.0.4-repack.tar.xz
New:
kbd-2.2.0-repack.tar.xz
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.toC0Um/_old 2020-03-08 22:23:43.132061967 +0100
+++ /var/tmp/diff_new_pack.toC0Um/_new 2020-03-08 22:23:43.172061991 +0100
@@ -22,14 +22,16 @@
%endif
Name: kbd
-Version:2.0.4
+Version:2.2.0
Release:0
Summary:Keyboard and Font Utilities
# git: git://git.altlinux.org/people/legion/packages/kbd.git
License:GPL-2.0-or-later
Group: System/Console
-URL:ftp://ftp.altlinux.org/pub/people/legion/kbd/
-# ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz repack_kbd.sh
+URL:http://kbd-project.org/
+# repack_kbd.sh on
ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-%{version}.tar.xz
+# or
+# repack_kbd.sh on
ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz
Source: %{name}-%{version}-repack.tar.xz
Source1:kbd_fonts.tar.bz2
Source2:suse-add.tar.bz2
@@ -120,7 +122,6 @@
%patch3
%patch4 -p1
%patch5 -p1
-# TODO: no ideas how to port it.
%patch6
%patch9
%patch10
@@ -143,7 +144,7 @@
# bnc#435121
test -f olpc/es-olpc.map || mv olpc/es.map olpc/es-olpc.map
# Rename conflicting keymaps, as Fedora do
- test -f dvorak/no.map || mv dvorak/no.map dvorak/no-dvorak.map
+ #test -f dvorak/no.map || mv dvorak/no.map dvorak/no-dvorak.map
test -f fgGIod/trf.map || mv fgGIod/trf.map fgGIod/trf-fgGIod.map
test -f olpc/pt.map || mv olpc/pt.map olpc/pt-olpc.map
test -f qwerty/cz.map || mv qwerty/cz.map qwerty/cz-qwerty.map
++ kbd-1.15.2-dumpkeys-C-opt.patch ++
--- /var/tmp/diff_new_pack.toC0Um/_old 2020-03-08 22:23:44.144062591 +0100
+++ /var/tmp/diff_new_pack.toC0Um/_new 2020-03-08 22:23:44.144062591 +0100
@@ -27,16 +27,16 @@
===
--- src/dumpkeys.c.orig
+++ src/dumpkeys.c
-@@ -45,6 +45,8 @@ valid options are:\n\
- -t --funcs-only display only the function key strings\n\
- -k --keys-only display only key bindings\n\
- -d --compose-only display only compose key combinations\n\
-+ -C \n\
-+ --console= Indicate the virtual console device to be used.\n\
- -c --charset="));
+@@ -41,6 +41,8 @@ usage(int rc)
+ " -t, --funcs-only display only the function key strings;\n"
+ " -k, --keys-only display only key bindings;\n"
+ " -d, --compose-onlydisplay only compose key combinations;\n"
++ " -C \n"
++ " --console=Indicate the virtual console device to be
used;\n"
+ " -c, --charset="));
lk_list_charsets(stderr);
- fprintf(stderr, _("\
-@@ -60,7 +62,7 @@ valid options are:\n\
+ fprintf(stderr, _(
+@@ -55,7 +57,7 @@ usage(int rc)
int main(int argc, char *argv[])
{
@@ -45,7 +45,7 @@
const struct option long_opts[] = {
{ "help", no_argument, NULL, 'h' },
{ "short-info", no_argument, NULL, 'i' },
-@@ -73,6 +75,7 @@ int main(int argc, char *argv[])
+@@ -68,6 +70,7 @@ int main(int argc, char *argv[])
{ "keys-only", no_argument, NULL, 'k' },
{ "compose-only", no_argument, NULL, 'd' },
{ "charset", required_argument, NULL, 'c' },
@@ -53,7 +53,7 @@
{ "verbose", no_argument, NULL, 'v' },
{ "version", no_argument, NULL, 'V' },
{ NULL, 0, NULL, 0 }
-@@ -87,6 +90,7 @@ int main(int
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2020-01-20 22:48:19
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new.26092 (New)
Package is "kbd"
Mon Jan 20 22:48:19 2020 rev:94 rq:764374 version:2.0.4
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2020-01-06 16:02:06.745723445
+0100
+++ /work/SRC/openSUSE:Factory/.kbd.new.26092/kbd.changes 2020-01-20
22:48:30.143183277 +0100
@@ -1,0 +2,10 @@
+Thu Jan 9 22:35:51 UTC 2020 - Stefan Brüns
+
+- Use a UTF-8 capable locale, otherwise ckbcomp will not not able
+ to do proper uppercase/lowercase conversions.
+- Rebase cz-map.patch after UTF-8 changes.
+- Skip compression/decompression of maps which are about to be
+ discarded later (~30%). Avoid zgrep, which is a shell script
+ spawning grep and gunzip for each input file.
+
+---
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.ISGYM1/_old 2020-01-20 22:48:32.975184366 +0100
+++ /var/tmp/diff_new_pack.ISGYM1/_new 2020-01-20 22:48:32.979184367 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kbd
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -329,6 +329,9 @@
mkdir -p %{buildroot}%{kbd}/keymaps/legacy
mv %{buildroot}%{kbd}/keymaps/{amiga,atari,i386,include,mac,ppc,sun}
%{buildroot}%{kbd}/keymaps/legacy
+# Make sure Perl has a locale where uc/lc works for unicode codepoints
+# see e.g.
https://perldoc.perl.org/perldiag.html#Wide-character-(U%2b%25X)-in-%25s
+export LC_ALL=C.utf-8
# Convert X keyboard layouts to console keymaps
mkdir -p %{buildroot}%{kbd}/keymaps/xkb
perl xml2lst.pl < %{_datadir}/X11/xkb/rules/base.xml > layouts-variants.lst
@@ -336,22 +339,24 @@
XKBLAYOUT=`echo "$line" | cut -d " " -f 1`
echo "$XKBLAYOUT" >> layouts-list.lst
XKBVARIANT=`echo "$line" | cut -d " " -f 2`
- ckbcomp "$XKBLAYOUT" "$XKBVARIANT" | gzip -n9 >
%{buildroot}%{kbd}/keymaps/xkb/"$XKBLAYOUT"-"$XKBVARIANT".map.gz
+ ckbcomp "$XKBLAYOUT" "$XKBVARIANT" > /tmp/"$XKBLAYOUT"-"$XKBVARIANT".map
+ # skip converted layouts which cannot input ASCII (rh#1031848)
+ grep -q "U+0041" /tmp/"$XKBLAYOUT"-"$XKBVARIANT".map && \
+gzip -cn9 /tmp/"$XKBLAYOUT"-"$XKBVARIANT".map >
%{buildroot}%{kbd}/keymaps/xkb/"$XKBLAYOUT"-"$XKBVARIANT".map.gz
+ rm /tmp/"$XKBLAYOUT"-"$XKBVARIANT".map
done < layouts-variants.lst
# Convert X keyboard layouts (plain, no variant)
cat layouts-list.lst | sort -u >> layouts-list-uniq.lst
while read line; do
- ckbcomp "$line" | gzip -n9 > %{buildroot}%{kbd}/keymaps/xkb/"$line".map.gz
+ ckbcomp "$line" > /tmp/"$line".map
+ grep -q "U+0041" /tmp/"$line".map && \
+gzip -cn9 /tmp/"$line".map > %{buildroot}%{kbd}/keymaps/xkb/"$line".map.gz
+ rm /tmp/"$line".map
done < layouts-list-uniq.lst
-# wipe converted layouts which cannot input ASCII (rh#1031848)
-zgrep -L "U+0041" %{buildroot}%{kbd}/keymaps/xkb/* | xargs rm -f
-
# Rename the converted default fi (kotoistus) layout (rh#1117891)
-gunzip %{buildroot}%{kbd}/keymaps/xkb/fi.map.gz
-mv %{buildroot}%{kbd}/keymaps/xkb/fi.map
%{buildroot}%{kbd}/keymaps/xkb/fi-kotoistus.map
-gzip -n9 %{buildroot}%{kbd}/keymaps/xkb/fi-kotoistus.map
+mv %{buildroot}%{kbd}/keymaps/xkb/fi.map.gz
%{buildroot}%{kbd}/keymaps/xkb/fi-kotoistus.map.gz
# Fix converted cz layout - add compose rules (rh#1181581)
gunzip %{buildroot}%{kbd}/keymaps/xkb/cz.map.gz
++ cz-map.patch ++
--- /var/tmp/diff_new_pack.ISGYM1/_old 2020-01-20 22:48:33.039184391 +0100
+++ /var/tmp/diff_new_pack.ISGYM1/_new 2020-01-20 22:48:33.039184391 +0100
@@ -3,7 +3,7 @@
@@ -39,7 +39,7 @@
keycode 38 = +U+006c +U+004c +U+0141 +U+0141 Control_l Control_l Control_l
Control_l Meta_l Meta_L Meta_l Meta_L Meta_Control_l Meta_Control_l
Meta_Control_l Meta_Control_l +U+006c +U+004c +U+0141 +U+0141 Control_l
Control_l Control_l Control_l Meta_l Meta_L Meta_l Meta_L Meta_Control_l
Meta_Control_l Meta_Control_l Meta_Control_l +U+006c +U+004c +U+0141 +U+0141
Control_l Control_l Control_l Control_l Meta_l Meta_L Meta_l Meta_L
Meta_Control_l Meta_Control_l Meta_Control_l Meta_Control_l +U+006c +U+004c
+U+0141 +U+0141 Control_l Control_l Control_l Control_l Meta_l Meta_L Meta_l
Meta_L Meta_Control_l Meta_Control_l Meta_Control_l Meta_Control_l +U+004c
+U+006c +U+0142 +U+0142 Control_l Control_l Control_l Control_l Meta_l Meta_L
Meta_l Meta_L Meta_Control_l Meta_Control_l Meta_Control_l Meta_Control_l
+U+004c +U+006c +U+0142 +U+0142 Control_l Control_l Control_l
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2020-01-06 16:02:05
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new.6675 (New)
Package is "kbd"
Mon Jan 6 16:02:05 2020 rev:93 rq:760513 version:2.0.4
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2019-09-26 20:35:44.431423191
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new.6675/kbd.changes2020-01-06
16:02:06.745723445 +0100
@@ -1,0 +2,5 @@
+Thu Dec 5 12:15:22 UTC 2019 - ku...@suse.de
+
+- Move pam.d/vlock to /usr/etc
+
+---
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.IJNXzD/_old 2020-01-06 16:02:07.573723875 +0100
+++ /var/tmp/diff_new_pack.IJNXzD/_new 2020-01-06 16:02:07.577723878 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kbd
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -28,7 +28,7 @@
# git: git://git.altlinux.org/people/legion/packages/kbd.git
License:GPL-2.0-or-later
Group: System/Console
-Url:ftp://ftp.altlinux.org/pub/people/legion/kbd/
+URL:ftp://ftp.altlinux.org/pub/people/legion/kbd/
# ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz repack_kbd.sh
Source: %{name}-%{version}-repack.tar.xz
Source1:kbd_fonts.tar.bz2
@@ -274,8 +274,8 @@
install -d %{buildroot}%{_libexecdir}/%{name}
install -m 755 numlockbios %{buildroot}%{_libexecdir}/%{name}
%endif
-install -d %{buildroot}%{_sysconfdir}/pam.d
-install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/vlock
+install -d %{buildroot}%{_distconfdir}/pam.d
+install -m 644 %{SOURCE4} %{buildroot}%{_distconfdir}/pam.d/vlock
install -m 644 %{SOURCE12} %{buildroot}%{_mandir}/man8/
install -m 755 %{SOURCE13} %{buildroot}%{_bindir}/guess_encoding
install -m 755 %{SOURCE14} %{buildroot}%{_bindir}/kbd
@@ -371,6 +371,8 @@
%pre
%{service_add_pre kbdsettings.service}
+# move outdated pam.d/*.rpmsave files away
+test -f /etc/pam.d/vlock.rpmsave && mv -v /etc/pam.d/vlock.rpmsave
/etc/pam.d/vlock.rpmsave.old ||:
%post
%{fillup_only -n console}
@@ -393,6 +395,8 @@
%posttrans
%{?regenerate_initrd_posttrans}
+# Migration to /usr/etc.
+test -f /etc/pam.d/vlock.rpmsave && mv -v /etc/pam.d/vlock.rpmsave
/etc/pam.d/vlock ||:
%files -f %{name}.lang
#config(noreplace) /etc/sysconfig/console
@@ -515,7 +519,7 @@
%{_mandir}/man8/setvesablank.8%{ext_man}
%{_mandir}/man8/setvtrgb.8%{ext_man}
%{_mandir}/man8/vcstime.8%{ext_man}
-%config(noreplace) %{_sysconfdir}/pam.d/vlock
+%{_distconfdir}/pam.d/vlock
%dir %{_datadir}/systemd
%{_prefix}/lib/systemd/system/kbdsettings.service
%{_datadir}/systemd/kbd-model-map.xkb-generated
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2019-09-26 20:35:42
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new.2352 (New)
Package is "kbd"
Thu Sep 26 20:35:42 2019 rev:92 rq:731996 version:2.0.4
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2018-08-06 11:52:56.157104610
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new.2352/kbd.changes2019-09-26
20:35:44.431423191 +0200
@@ -1,0 +2,6 @@
+Thu Sep 19 09:05:55 UTC 2019 - Martin Vidner
+
+- Allow YaST to select Iranian (Persian, Farsi) keyboard layout
+ (bsc#1092920)
+
+---
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.jdySC1/_old 2019-09-26 20:35:45.975419064 +0200
+++ /var/tmp/diff_new_pack.jdySC1/_new 2019-09-26 20:35:45.983419043 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kbd
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,9 +25,9 @@
Version:2.0.4
Release:0
Summary:Keyboard and Font Utilities
+# git: git://git.altlinux.org/people/legion/packages/kbd.git
License:GPL-2.0-or-later
Group: System/Console
-# git: git://git.altlinux.org/people/legion/packages/kbd.git
Url:ftp://ftp.altlinux.org/pub/people/legion/kbd/
# ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz repack_kbd.sh
Source: %{name}-%{version}-repack.tar.xz
@@ -203,6 +203,7 @@
ln -sf us.map.gz $K/keymaps/i386/qwerty/khmer.map.gz
ln -sf us.map.gz $K/keymaps/i386/qwerty/korean.map.gz
ln -sf us.map.gz $K/keymaps/i386/qwerty/arabic.map.gz
+ln -sf us.map.gz $K/keymaps/i386/qwerty/ir.map.gz
ln -sf us.map.gz $K/keymaps/i386/qwerty/chinese.map.gz
ln -sf us.map.gz $K/keymaps/i386/qwerty/taiwanese.map.gz
ln -sf sr-cy.map.gz $K/keymaps/i386/qwerty/sr-latin.map.gz
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2018-08-06 11:52:53
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is "kbd"
Mon Aug 6 11:52:53 2018 rev:91 rq:627150 version:2.0.4
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2018-05-30 12:29:32.373507689
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2018-08-06
11:52:56.157104610 +0200
@@ -1,0 +2,5 @@
+Thu Aug 2 08:06:01 UTC 2018 - sch...@suse.de
+
+- fbtest.c: include for major/minor
+
+---
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.1AeBcX/_old 2018-08-06 11:52:57.077106206 +0200
+++ /var/tmp/diff_new_pack.1AeBcX/_new 2018-08-06 11:52:57.077106206 +0200
@@ -25,9 +25,9 @@
Version:2.0.4
Release:0
Summary:Keyboard and Font Utilities
-# git: git://git.altlinux.org/people/legion/packages/kbd.git
License:GPL-2.0-or-later
Group: System/Console
+# git: git://git.altlinux.org/people/legion/packages/kbd.git
Url:ftp://ftp.altlinux.org/pub/people/legion/kbd/
# ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz repack_kbd.sh
Source: %{name}-%{version}-repack.tar.xz
++ fbtest.c ++
--- /var/tmp/diff_new_pack.1AeBcX/_old 2018-08-06 11:52:57.145106324 +0200
+++ /var/tmp/diff_new_pack.1AeBcX/_new 2018-08-06 11:52:57.145106324 +0200
@@ -16,6 +16,7 @@
#include
#include
#include
+#include
#include
#include
#include
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2018-05-30 11:43:56
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is "kbd"
Wed May 30 11:43:56 2018 rev:90 rq:612692 version:2.0.4
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2018-04-16 12:43:48.916406195
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2018-05-30
12:29:32.373507689 +0200
@@ -1,0 +2,5 @@
+Thu May 24 16:14:57 CEST 2018 - ku...@suse.de
+
+- Use %license instead of %doc [bsc#1082318]
+
+---
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.xVZvz8/_old 2018-05-30 12:29:33.089481600 +0200
+++ /var/tmp/diff_new_pack.xVZvz8/_new 2018-05-30 12:29:33.089481600 +0200
@@ -190,7 +190,7 @@
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 %{_datadir}/i18/charmaps for a description of char maps"
>$DOC/doc/README.charmaps
-install -m 644 COPYING ChangeLog CREDITS README $DOC/
+install -m 644 ChangeLog CREDITS README $DOC/
install -m 644 %{SOURCE3} $DOC/
rm -f $K/consolefonts/README* $K/consolefonts/ERRORS.gz
if ls $K/consolefonts/Agafari-* > /dev/null 2>&1; then
@@ -395,6 +395,7 @@
%files -f %{name}.lang
#config(noreplace) /etc/sysconfig/console
+%license COPYING
%doc %{_defaultdocdir}/kbd
#doc COPYING CHANGES README CREDITS
%{_fillupdir}/sysconfig.console
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2018-04-16 12:43:47
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is "kbd"
Mon Apr 16 12:43:47 2018 rev:89 rq:595699 version:2.0.4
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2018-03-24 16:10:21.218369233
+0100
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2018-04-16
12:43:48.916406195 +0200
@@ -1,0 +2,6 @@
+Thu Apr 5 17:32:03 CEST 2018 - sbra...@suse.com
+
+- Disable characters >=U+F000. These do not work properly
+ (bsc#1085432#c15, kbd-unicode-fxxx.patch).
+
+---
Other differences:
--
++ kbd-unicode-fxxx.patch ++
--- /var/tmp/diff_new_pack.hNLP5k/_old 2018-04-16 12:43:49.884370973 +0200
+++ /var/tmp/diff_new_pack.hNLP5k/_new 2018-04-16 12:43:49.884370973 +0200
@@ -1,34 +1,71 @@
-Partially revert 3f065394 to not fail on ligature fi and other characters with
UNICODE code 0xFxxx.
+Disable characters >=U+F000. These do not work properly.
-Index: kbd-2.0.4/src/libkeymap/analyze.l
-===
kbd-2.0.4.orig/src/libkeymap/analyze.l
-+++ kbd-2.0.4/src/libkeymap/analyze.l
-@@ -361,11 +361,6 @@ To to|To|TO
- }
- {Unicode} {
- yylval->num = strtol(yytext + 1, NULL, 16);
-- if (yylval->num >= 0xf000) {
-- ERR(yyextra, _("unicode keysym out of
range: %s"),
-- yytext);
-- return(ERROR);
-- }
- return(UNUMBER);
- }
- {Decimal}|{Octal}|{Hex} {
-Index: kbd-2.0.4/src/libkeymap/analyze.c
+Explanation from Alexey Gladkov:
+
+The kbd value is unsigned short [1] and take a look how kernel gets
+a type [2]. The last bytes are occupied by type.
+
+[1]
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/linux/kd.h?id=06dd3dfeea60e2a6457a6aedf97afc8e6d2ba497#n103
+[2]
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/linux/keyboard.h?id=06dd3dfeea60e2a6457a6aedf97afc8e6d2ba497#n45
+
+The problem in the kernel. In the kb_value there is no room to store such
+values.
+
+Index: kbd-2.0.4/data/keymaps/i386/qwertz/de_alt_UTF-8.map
===
kbd-2.0.4.orig/src/libkeymap/analyze.c
-+++ kbd-2.0.4/src/libkeymap/analyze.c
-@@ -1499,11 +1499,6 @@ YY_RULE_SETUP
- #line 362 "analyze.l"
- {
- yylval->num = strtol(yytext + 1, NULL, 16);
-- if (yylval->num >= 0xf000) {
-- ERR(yyextra, _("unicode keysym out of
range: %s"),
-- yytext);
-- return(ERROR);
-- }
- return(UNUMBER);
- }
- YY_BREAK
+--- kbd-2.0.4.orig/data/keymaps/i386/qwertz/de_alt_UTF-8.map
kbd-2.0.4/data/keymaps/i386/qwertz/de_alt_UTF-8.map
+@@ -160,7 +160,7 @@ shift alt keycode 2 = U+00AC # notsig
+ shift alt keycode 3 = U+201D # right double quote
+ shift alt keycode 4 = numbersign
+ shift alt keycode 5 = sterling
+-shift alt keycode 6 = U+FB01 # fi ligature
++#shift alt keycode 6 = U+FB01 # fi ligature
+ shift alt keycode 7 = dead_circumflex
+ shift alt keycode 8 = backslash
+ shift alt keycode 9 = U+02DC # small tilde
+@@ -179,7 +179,7 @@ shift alt keycode 23 = Ucircumflex
+ shift alt keycode 24 = Ooblique
+ shift alt keycode 25 = U+220F # n-ary product
+ shift alt keycode 26 = degree
+-shift alt keycode 27 = U+F8FF # apple logo
++#shift alt keycode 27 = U+F8FF # apple logo
+ shift alt keycode 30 = Aring
+ shift alt keycode 31 = Iacute
+ shift alt keycode 32 = U+2122 # trade mark
+@@ -188,7 +188,7 @@ shift alt keycode 34 = Igrave
+ shift alt keycode 35 = Oacute
+ shift alt keycode 36 = U+0131 # dotless i
+ shift alt keycode 37 = U+02C6 # circumflex accent
+-shift alt keycode 38 = U+FB02 # fl ligature
++#shift alt keycode 38 = U+FB02 # fl ligature
+ shift alt keycode 39 = U+0152 # OE
+ shift alt keycode 40 = AE
+ shift alt keycode 41 = U+201C # left double quote
+@@ -210,7 +210,7 @@ control shift alt keycode 2 = U+00AC
+ control shift alt keycode 3 = U+201D # right double quote
+ control shift alt keycode 4 = numbersign
+ control shift alt
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2018-03-24 16:10:16
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is "kbd"
Sat Mar 24 16:10:16 2018 rev:88 rq:590384 version:2.0.4
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2018-01-30 15:38:01.728462058
+0100
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2018-03-24
16:10:21.218369233 +0100
@@ -1,0 +2,6 @@
+Thu Mar 15 17:04:06 CET 2018 - sbra...@suse.com
+
+- Do not cause error on UNICODE characters >= 0xF000 (e. g.
+ ligature fi) (bsc#1085432, kbd-unicode-fxxx.patch).
+
+---
New:
kbd-unicode-fxxx.patch
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.gC3ANf/_old 2018-03-24 16:10:23.094301609 +0100
+++ /var/tmp/diff_new_pack.gC3ANf/_new 2018-03-24 16:10:23.102301320 +0100
@@ -26,7 +26,7 @@
Release:0
Summary:Keyboard and Font Utilities
# git: git://git.altlinux.org/people/legion/packages/kbd.git
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: System/Console
Url:ftp://ftp.altlinux.org/pub/people/legion/kbd/
# ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz repack_kbd.sh
@@ -65,6 +65,8 @@
Patch13:kbd-1.15.5-loadkeys-search-path.patch
# PATCH-FEATURE-OPENSUSE kbdsettings-nox86.patch sbra...@suse.cz -- Disable
"bios" option for NumLock settings on non x86 platforms.
Patch14:kbdsettings-nox86.patch
+# PATCH-FIX-SLE kbd-unicode-fxxx.patch sbra...@suse.com bsc1085432 -- Do not
cause error on UNICODE characters >= 0xF000 (e. g. ligature fi)
+Patch15:kbd-unicode-fxxx.patch
BuildRequires: automake
BuildRequires: bison
BuildRequires: check-devel
@@ -128,6 +130,7 @@
%ifnarch %{ix86} x86_64
%patch14 -p0
%endif
+%patch15 -p1
%build
for i in `find data/keymaps/mac -type f` ; do
++ kbd-unicode-fxxx.patch ++
Partially revert 3f065394 to not fail on ligature fi and other characters with
UNICODE code 0xFxxx.
Index: kbd-2.0.4/src/libkeymap/analyze.l
===
--- kbd-2.0.4.orig/src/libkeymap/analyze.l
+++ kbd-2.0.4/src/libkeymap/analyze.l
@@ -361,11 +361,6 @@ To to|To|TO
}
{Unicode} {
yylval->num = strtol(yytext + 1, NULL, 16);
- if (yylval->num >= 0xf000) {
- ERR(yyextra, _("unicode keysym out of
range: %s"),
- yytext);
- return(ERROR);
- }
return(UNUMBER);
}
{Decimal}|{Octal}|{Hex}{
Index: kbd-2.0.4/src/libkeymap/analyze.c
===
--- kbd-2.0.4.orig/src/libkeymap/analyze.c
+++ kbd-2.0.4/src/libkeymap/analyze.c
@@ -1499,11 +1499,6 @@ YY_RULE_SETUP
#line 362 "analyze.l"
{
yylval->num = strtol(yytext + 1, NULL, 16);
- if (yylval->num >= 0xf000) {
- ERR(yyextra, _("unicode keysym out of
range: %s"),
- yytext);
- return(ERROR);
- }
return(UNUMBER);
}
YY_BREAK
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2018-01-30 15:37:59
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is "kbd"
Tue Jan 30 15:37:59 2018 rev:87 rq:569978 version:2.0.4
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2017-12-10 18:14:33.875426402
+0100
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2018-01-30
15:38:01.728462058 +0100
@@ -1,0 +2,14 @@
+Fri Jan 12 17:39:18 CET 2018 - sbra...@suse.com
+
+- Move initial NumLock handling from systemd back to kbd:
+ * Add kbdsettings service written by Thomas Blume (boo#1010880,
+kbdsettings, kbdsettings.service, numlockbios.c,
+update sysconfig.console and sysconfig.keyboard).
+ * Exclude numlockbios support for non x86 platforms
+(kbdsettings-nox86.patch).
+- Drop references to KEYTABLE and COMPOSETABLE (boo#1010880#c32,
+ boo#1010880#c54, sysconfig.keyboard.del, README.SUSE,
+ drop kbd.fillup).
+- Fix paths in kbd.pl.
+
+---
Old:
kbd.fillup
New:
kbdsettings
kbdsettings-nox86.patch
kbdsettings.service
numlockbios.c
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.jN1Fxc/_old 2018-01-30 15:38:03.152395578 +0100
+++ /var/tmp/diff_new_pack.jN1Fxc/_new 2018-01-30 15:38:03.156395391 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kbd
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,7 +35,6 @@
Source2:suse-add.tar.bz2
Source3:README.SUSE
Source4:vlock.pamd
-Source5:kbd.fillup
Source8:sysconfig.console
Source9:sysconfig.keyboard
Source11: fbtest.c
@@ -43,6 +42,9 @@
Source13: guess_encoding.pl
Source14: kbd.pl
Source15: cz-map.patch
+Source20: kbdsettings
+Source21: kbdsettings.service
+Source22: numlockbios.c
Source42: convert-kbd-mac.sed
Source43: repack_kbd.sh
Source44: xml2lst.pl
@@ -61,6 +63,8 @@
# Patch13: adds xkb and legacy keymaps subdirs to loadkyes search path
# (openSUSE FATE#318355, sle FATE#318426)
Patch13:kbd-1.15.5-loadkeys-search-path.patch
+# PATCH-FEATURE-OPENSUSE kbdsettings-nox86.patch sbra...@suse.cz -- Disable
"bios" option for NumLock settings on non x86 platforms.
+Patch14:kbdsettings-nox86.patch
BuildRequires: automake
BuildRequires: bison
BuildRequires: check-devel
@@ -102,8 +106,13 @@
%prep
%setup -q -a 1 -a 2 -n kbd-%{version}
+cp -fp %{SOURCE8} .
+cp -fp %{SOURCE9} .
cp -fp %{SOURCE44} .
cp -fp %{SOURCE45} .
+cp -fp %{SOURCE20} .
+cp -fp %{SOURCE21} .
+cp -fp %{SOURCE22} .
%patch0 -p1
%patch2
%patch3
@@ -116,6 +125,9 @@
%patch11
%patch12 -p1
%patch13 -p1
+%ifnarch %{ix86} x86_64
+%patch14 -p0
+%endif
%build
for i in `find data/keymaps/mac -type f` ; do
@@ -141,6 +153,9 @@
--enable-optional-progs
make %{?_smp_mflags}
gcc %{optflags} -o fbtest $RPM_SOURCE_DIR/fbtest.c
+%ifarch %{ix86} x86_64
+gcc %{optflags} -o numlockbios $RPM_SOURCE_DIR/numlockbios.c
+%endif
# fix lat2-16.psfu (bnc#340579)
font=data/consolefonts/lat2a-16.psfu
./src/psfxtable -i $font -it data/unimaps/lat2u.uni \
@@ -241,9 +256,8 @@
)
FILLUP_DIR=%{buildroot}%{_fillupdir}
mkdir -p $FILLUP_DIR
-install -m 644 %{SOURCE8} $FILLUP_DIR/sysconfig.console
-install -m 644 %{SOURCE9} $FILLUP_DIR/sysconfig.keyboard
-cat %{SOURCE5} >> $FILLUP_DIR/sysconfig.keyboard
+install -m 644 sysconfig.console $FILLUP_DIR/sysconfig.console
+install -m 644 sysconfig.keyboard $FILLUP_DIR/sysconfig.keyboard
%ifnarch %{ix86} x86_64
rm -f %{buildroot}%{_mandir}/man8/resizecons.8*
%endif
@@ -252,6 +266,10 @@
rm -f %{buildroot}%{_mandir}/man8/setkeycodes.8*
%endif
install -m 755 fbtest%{buildroot}%{_sbindir}
+%ifarch %{ix86} x86_64
+install -d %{buildroot}%{_libexecdir}/%{name}
+install -m 755 numlockbios %{buildroot}%{_libexecdir}/%{name}
+%endif
install -d %{buildroot}%{_sysconfdir}/pam.d
install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/vlock
install -m 644 %{SOURCE12} %{buildroot}%{_mandir}/man8/
@@ -341,14 +359,32 @@
sh ./genmap4systemd.sh %{buildroot}%{kbd}/keymaps/xkb \
> %{buildroot}%{_datadir}/systemd/kbd-model-map.xkb-generated
+install -m0755 kbdsettings %{buildroot}%{_sbindir}/
+install -d %{buildroot}%{_prefix}/lib/systemd/system
+install -m0644 kbdsettings.service %{buildroot}%{_prefix}/lib/systemd/system
+
%find_lang %{name}
+%pre
commit kbd for openSUSE:Factory
Hello community, here is the log from the commit of package kbd for openSUSE:Factory checked in at 2017-12-10 18:14:28 Comparing /work/SRC/openSUSE:Factory/kbd (Old) and /work/SRC/openSUSE:Factory/.kbd.new (New) Package is "kbd" Sun Dec 10 18:14:28 2017 rev:86 rq:555068 version:2.0.4 Changes: --- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2017-12-06 08:56:38.781252008 +0100 +++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2017-12-10 18:14:33.875426402 +0100 @@ -1,0 +2,8 @@ +Wed Dec 6 13:30:49 UTC 2017 - f...@suse.com + +- Drop from some fill-up templates, a couple of sysconfig variables no + more read by systemd (fate#319454) + + So the relevant settings can be defined in only one place. + +--- @@ -16 +24 @@ -- Version update to 2.0.6: +- Version update to 2.0.4: Other differences: -- ++ sysconfig.console ++ --- /var/tmp/diff_new_pack.Q3xbJy/_old 2017-12-10 18:14:35.583345053 +0100 +++ /var/tmp/diff_new_pack.Q3xbJy/_new 2017-12-10 18:14:35.583345053 +0100 @@ -2,44 +2,6 @@ ## Description: Text console settings (see also Hardware/Keyboard) ## Type: string ## Default:"" -## ServiceRestart: kbd -# -# Console settings. -# Note: The KBD_TTY setting from Hardware/Keyboard (sysconfig/keyboard) -# also applies for the settings here. -# -# Load this console font on bootup: -# (/usr/share/kbd/consolefonts/) -# -CONSOLE_FONT="" - -## Type: string -## Default:"" -# -# Some fonts come without a unicode map. -# (.psfu fonts supposedly have it, others often not.) -# You can then specify the unicode mapping of your font -# explicitly. (/usr/share/kbd/unimaps/) -# Normally not needed. -# -CONSOLE_UNICODEMAP="" - -## Type: string -## Default:"" -# -# Most programs output 8 bit characters, so you need a table to -# translate those characters into unicode. That one can be specified -# here. (/usr/share/kbd/consoletrans/) -# (Note: If your console is in utf-8 mode you don't need this.) -# If your code does not use a unicode mapping at all (because you -# e.g. explicitly specified UNICODEMAP="none") you may circumvent -# the translation via unicode, but load a map which directly maps -# 8 bit output of your program to a font position. -# -CONSOLE_SCREENMAP="" - -## Type: string -## Default:"" # # for some fonts the console has to be initialized with CONSOLE_MAGIC. # CONSOLE_MAGIC can be empty or have the values "(B", ")B", "(K" or ")K". ++ sysconfig.keyboard ++ --- /var/tmp/diff_new_pack.Q3xbJy/_old 2017-12-10 18:14:35.599344291 +0100 +++ /var/tmp/diff_new_pack.Q3xbJy/_new 2017-12-10 18:14:35.603344100 +0100 @@ -1,17 +1,5 @@ ## Path:Hardware/Keyboard ## Description: Keyboard settings -## Type:string -## Default: "" -## ServiceRestart: kbd -# -# Keyboard settings for the text console -# -# Keyboard mapping -# (/usr/share/kbd/keymaps/) -# e.g. KEYTABLE="de-latin1-nodeadkeys", "us" or empty for US settings -# -KEYTABLE="" - ## Type:integer ## Default: #
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2017-12-06 08:56:37
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is "kbd"
Wed Dec 6 08:56:37 2017 rev:85 rq:545115 version:2.0.4
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2017-10-28 14:16:54.462031362
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2017-12-06
08:56:38.781252008 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 13:40:21 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new
+ %_fillupdir macro (boo#1069468)
+
+---
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.5g1dAq/_old 2017-12-06 08:56:39.597222139 +0100
+++ /var/tmp/diff_new_pack.5g1dAq/_new 2017-12-06 08:56:39.601221993 +0100
@@ -16,6 +16,11 @@
#
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+ %define _fillupdir /var/adm/fillup-templates
+%endif
+
Name: kbd
Version:2.0.4
Release:0
@@ -234,7 +239,7 @@
do test -f $i || ln -sv mac-us.map.gz $i
done
)
-FILLUP_DIR=%{buildroot}%{_localstatedir}/adm/fillup-templates
+FILLUP_DIR=%{buildroot}%{_fillupdir}
mkdir -p $FILLUP_DIR
install -m 644 %{SOURCE8} $FILLUP_DIR/sysconfig.console
install -m 644 %{SOURCE9} $FILLUP_DIR/sysconfig.keyboard
@@ -353,8 +358,8 @@
#config(noreplace) /etc/sysconfig/console
%doc %{_defaultdocdir}/kbd
#doc COPYING CHANGES README CREDITS
-%{_localstatedir}/adm/fillup-templates/sysconfig.console
-%{_localstatedir}/adm/fillup-templates/sysconfig.keyboard
+%{_fillupdir}/sysconfig.console
+%{_fillupdir}/sysconfig.keyboard
%{kbd}
%exclude %{kbd}/keymaps/legacy
#UsrMerge
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2017-10-28 14:16:53
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is "kbd"
Sat Oct 28 14:16:53 2017 rev:84 rq:535163 version:2.0.4
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2017-09-29 11:52:23.680114346
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2017-10-28
14:16:54.462031362 +0200
@@ -1,0 +2,6 @@
+Fri Oct 13 14:53:41 CEST 2017 - sbra...@suse.com
+
+- Add vlock.pamd PAM file (bsc#1056449#c8).
+- Clean spec file.
+
+---
New:
vlock.pamd
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.8imq1o/_old 2017-10-28 14:16:55.417996403 +0200
+++ /var/tmp/diff_new_pack.8imq1o/_new 2017-10-28 14:16:55.417996403 +0200
@@ -29,6 +29,7 @@
Source1:kbd_fonts.tar.bz2
Source2:suse-add.tar.bz2
Source3:README.SUSE
+Source4:vlock.pamd
Source5:kbd.fillup
Source8:sysconfig.console
Source9:sysconfig.keyboard
@@ -73,7 +74,6 @@
Requires(pre): %fillup_prereq
Provides: vlock = 2.2.3
Obsoletes: vlock <= 2.2.3
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Load and save keyboard mappings. This is needed if you are not using
@@ -96,6 +96,7 @@
%prep
%setup -q -a 1 -a 2 -n kbd-%{version}
+
cp -fp %{SOURCE44} .
cp -fp %{SOURCE45} .
%patch0 -p1
@@ -239,16 +240,18 @@
install -m 644 %{SOURCE9} $FILLUP_DIR/sysconfig.keyboard
cat %{SOURCE5} >> $FILLUP_DIR/sysconfig.keyboard
%ifnarch %{ix86} x86_64
- rm -f %{buildroot}/%{_mandir}/man8/resizecons.8*
+ rm -f %{buildroot}%{_mandir}/man8/resizecons.8*
%endif
%ifarch %{sparc} m68k
-rm -f %{buildroot}/%{_mandir}/man8/getkeycodes.8*
-rm -f %{buildroot}/%{_mandir}/man8/setkeycodes.8*
+rm -f %{buildroot}%{_mandir}/man8/getkeycodes.8*
+rm -f %{buildroot}%{_mandir}/man8/setkeycodes.8*
%endif
-install -m 755 fbtest%{buildroot}/%{_sbindir}
-install -m 644 %{SOURCE12} %{buildroot}/%{_mandir}/man8/
-install -m 755 %{SOURCE13} %{buildroot}/%{_bindir}/guess_encoding
-install -m 755 %{SOURCE14} %{buildroot}/%{_bindir}/kbd
+install -m 755 fbtest%{buildroot}%{_sbindir}
+install -d %{buildroot}%{_sysconfdir}/pam.d
+install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/vlock
+install -m 644 %{SOURCE12} %{buildroot}%{_mandir}/man8/
+install -m 755 %{SOURCE13} %{buildroot}%{_bindir}/guess_encoding
+install -m 755 %{SOURCE14} %{buildroot}%{_bindir}/kbd
#UsrMerge
mkdir -p %{buildroot}/bin
mkdir -p %{buildroot}/sbin
@@ -296,41 +299,41 @@
#EndUsrMerge
# Move original keymaps to legacy directory
-mkdir -p %{buildroot}/%{kbd}/keymaps/legacy
-mv %{buildroot}/%{kbd}/keymaps/{amiga,atari,i386,include,mac,ppc,sun}
%{buildroot}/%{kbd}/keymaps/legacy
+mkdir -p %{buildroot}%{kbd}/keymaps/legacy
+mv %{buildroot}%{kbd}/keymaps/{amiga,atari,i386,include,mac,ppc,sun}
%{buildroot}%{kbd}/keymaps/legacy
# Convert X keyboard layouts to console keymaps
-mkdir -p %{buildroot}/%{kbd}/keymaps/xkb
+mkdir -p %{buildroot}%{kbd}/keymaps/xkb
perl xml2lst.pl < %{_datadir}/X11/xkb/rules/base.xml > layouts-variants.lst
while read line; do
XKBLAYOUT=`echo "$line" | cut -d " " -f 1`
echo "$XKBLAYOUT" >> layouts-list.lst
XKBVARIANT=`echo "$line" | cut -d " " -f 2`
- ckbcomp "$XKBLAYOUT" "$XKBVARIANT" | gzip -n9 >
%{buildroot}/%{kbd}/keymaps/xkb/"$XKBLAYOUT"-"$XKBVARIANT".map.gz
+ ckbcomp "$XKBLAYOUT" "$XKBVARIANT" | gzip -n9 >
%{buildroot}%{kbd}/keymaps/xkb/"$XKBLAYOUT"-"$XKBVARIANT".map.gz
done < layouts-variants.lst
# Convert X keyboard layouts (plain, no variant)
cat layouts-list.lst | sort -u >> layouts-list-uniq.lst
while read line; do
- ckbcomp "$line" | gzip -n9 > %{buildroot}/%{kbd}/keymaps/xkb/"$line".map.gz
+ ckbcomp "$line" | gzip -n9 > %{buildroot}%{kbd}/keymaps/xkb/"$line".map.gz
done < layouts-list-uniq.lst
# wipe converted layouts which cannot input ASCII (rh#1031848)
-zgrep -L "U+0041" %{buildroot}/%{kbd}/keymaps/xkb/* | xargs rm -f
+zgrep -L "U+0041" %{buildroot}%{kbd}/keymaps/xkb/* | xargs rm -f
# Rename the converted default fi (kotoistus) layout (rh#1117891)
-gunzip %{buildroot}/%{kbd}/keymaps/xkb/fi.map.gz
-mv %{buildroot}/%{kbd}/keymaps/xkb/fi.map
%{buildroot}/%{kbd}/keymaps/xkb/fi-kotoistus.map
-gzip -n9 %{buildroot}/%{kbd}/keymaps/xkb/fi-kotoistus.map
+gunzip %{buildroot}%{kbd}/keymaps/xkb/fi.map.gz
+mv %{buildroot}%{kbd}/keymaps/xkb/fi.map
%{buildroot}%{kbd}/keymaps/xkb/fi-kotoistus.map
+gzip -n9 %{buildroot}%{kbd}/keymaps/xkb/fi-kotoistus.map
# Fix converted cz layout - add compose rules (rh#1181581)
-gunzip
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2017-09-29 11:52:20
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is "kbd"
Fri Sep 29 11:52:20 2017 rev:83 rq:529011 version:2.0.4
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2017-05-06 18:25:20.803672429
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2017-09-29
11:52:23.680114346 +0200
@@ -1,0 +2,10 @@
+Fri Sep 22 15:51:51 CEST 2017 - sbra...@suse.com
+
+- Version update to 2.0.6:
+ * translation updates
+ * support for U+202F
+ * minor fixes and code cleanup
+ * minor improvements and more characters support
+- Enable vlock (bsc#1056449, FATE#261).
+
+---
Old:
kbd-2.0.3-repack.tar.bz2
New:
kbd-2.0.4-repack.tar.xz
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.RTJf1D/_old 2017-09-29 11:52:24.811954741 +0200
+++ /var/tmp/diff_new_pack.RTJf1D/_new 2017-09-29 11:52:24.815954177 +0200
@@ -17,7 +17,7 @@
Name: kbd
-Version:2.0.3
+Version:2.0.4
Release:0
Summary:Keyboard and Font Utilities
# git: git://git.altlinux.org/people/legion/packages/kbd.git
@@ -25,7 +25,7 @@
Group: System/Console
Url:ftp://ftp.altlinux.org/pub/people/legion/kbd/
# ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz repack_kbd.sh
-Source: %{name}-%{version}-repack.tar.bz2
+Source: %{name}-%{version}-repack.tar.xz
Source1:kbd_fonts.tar.bz2
Source2:suse-add.tar.bz2
Source3:README.SUSE
@@ -71,6 +71,8 @@
Requires(post): coreutils
Requires(postun): coreutils
Requires(pre): %fillup_prereq
+Provides: vlock = 2.2.3
+Obsoletes: vlock <= 2.2.3
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -130,8 +132,7 @@
--datadir=%{kbd} \
--enable-nls \
--localedir=%{_datadir}/locale \
- --enable-optional-progs \
- --disable-vlock
+ --enable-optional-progs
make %{?_smp_mflags}
gcc %{optflags} -o fbtest $RPM_SOURCE_DIR/fbtest.c
# fix lat2-16.psfu (bnc#340579)
@@ -439,6 +440,7 @@
%{_bindir}/setvesablank
%{_bindir}/spawn_console
%{_bindir}/spawn_login
+%{_bindir}/vlock
%{_mandir}/man1/*
%{_mandir}/man5/keymaps.5%{ext_man}
%ifnarch %{sparc} m68k
++ kbd-1.15.2-dumpkeys-C-opt.patch ++
--- /var/tmp/diff_new_pack.RTJf1D/_old 2017-09-29 11:52:24.919939513 +0200
+++ /var/tmp/diff_new_pack.RTJf1D/_new 2017-09-29 11:52:24.923938950 +0200
@@ -1,18 +1,18 @@
Index: docs/man/man1/dumpkeys.1.in
===
docs/man/man1/dumpkeys.1.in.orig 2013-08-27 22:45:33.0 +0200
-+++ docs/man/man1/dumpkeys.1.in2014-09-12 13:42:01.557871837 +0200
+--- docs/man/man1/dumpkeys.1.in.orig
docs/man/man1/dumpkeys.1.in
@@ -4,6 +4,7 @@
dumpkeys \- dump keyboard translation tables
.SH SYNOPSIS
.B dumpkeys
+.RI [ \-C\ '' | \-\-console='' ]
[
- .B \-hilfn
- .BI \-c charset
-@@ -197,6 +198,12 @@
- loadkeys how to interpret the keymap. (For example, "division" is
- 0xf7 in iso-8859-1 but 0xba in iso-8859-8.)
+ .\".B \-1Vdfhiklnstv
+ .B \-h \-\-help \-i \-\-short\-info \-l \-s \-\-long\-info
+@@ -212,6 +213,12 @@ loadkeys how to interpret the keymap. (F
+ .B \-V \-\-version
+ Prints version number and exits.
.LP
+The affected console device can be specified using the
+.I -C
@@ -25,43 +25,43 @@
.TP 20
Index: src/dumpkeys.c
===
src/dumpkeys.c.orig2014-06-15 20:33:18.0 +0200
-+++ src/dumpkeys.c 2014-09-12 13:47:09.633866557 +0200
-@@ -41,6 +41,8 @@
- --funcs-only display only the function key strings\n\
- --keys-only display only key bindings\n\
- --compose-only display only compose key combinations\n\
+--- src/dumpkeys.c.orig
src/dumpkeys.c
+@@ -45,6 +45,8 @@ valid options are:\n\
+ -t --funcs-only display only the function key strings\n\
+ -k --keys-only display only key bindings\n\
+ -d --compose-only display only compose key combinations\n\
+ -C \n\
+ --console= Indicate the virtual console device to be used.\n\
-c --charset="));
lk_list_charsets(stderr);
fprintf(stderr, _("\
-@@ -52,7 +54,7 @@
+@@ -60,7 +62,7 @@ valid options are:\n\
- int
- main (int argc, char *argv[]) {
-- const char *short_opts = "hilvsnf1tkdS:c:V";
-+ const char *short_opts = "hilvsnf1tkdS:C:c:V";
+ int main(int argc, char *argv[])
+ {
+-
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2017-05-06 18:25:19
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is "kbd"
Sat May 6 18:25:19 2017 rev:82 rq:492633 version:2.0.3
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2017-03-31 15:01:32.111838517
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2017-05-06
18:25:20.803672429 +0200
@@ -1,0 +2,5 @@
+Sun Apr 30 04:31:25 UTC 2017 - bwiedem...@suse.com
+
+- call gzip -n to make build fully reproducible
+
+---
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.nf3iE8/_old 2017-05-06 18:25:22.239469831 +0200
+++ /var/tmp/diff_new_pack.nf3iE8/_new 2017-05-06 18:25:22.243469266 +0200
@@ -305,13 +305,13 @@
XKBLAYOUT=`echo "$line" | cut -d " " -f 1`
echo "$XKBLAYOUT" >> layouts-list.lst
XKBVARIANT=`echo "$line" | cut -d " " -f 2`
- ckbcomp "$XKBLAYOUT" "$XKBVARIANT" | gzip >
%{buildroot}/%{kbd}/keymaps/xkb/"$XKBLAYOUT"-"$XKBVARIANT".map.gz
+ ckbcomp "$XKBLAYOUT" "$XKBVARIANT" | gzip -n9 >
%{buildroot}/%{kbd}/keymaps/xkb/"$XKBLAYOUT"-"$XKBVARIANT".map.gz
done < layouts-variants.lst
# Convert X keyboard layouts (plain, no variant)
cat layouts-list.lst | sort -u >> layouts-list-uniq.lst
while read line; do
- ckbcomp "$line" | gzip > %{buildroot}/%{kbd}/keymaps/xkb/"$line".map.gz
+ ckbcomp "$line" | gzip -n9 > %{buildroot}/%{kbd}/keymaps/xkb/"$line".map.gz
done < layouts-list-uniq.lst
# wipe converted layouts which cannot input ASCII (rh#1031848)
@@ -320,12 +320,12 @@
# Rename the converted default fi (kotoistus) layout (rh#1117891)
gunzip %{buildroot}/%{kbd}/keymaps/xkb/fi.map.gz
mv %{buildroot}/%{kbd}/keymaps/xkb/fi.map
%{buildroot}/%{kbd}/keymaps/xkb/fi-kotoistus.map
-gzip %{buildroot}/%{kbd}/keymaps/xkb/fi-kotoistus.map
+gzip -n9 %{buildroot}/%{kbd}/keymaps/xkb/fi-kotoistus.map
# Fix converted cz layout - add compose rules (rh#1181581)
gunzip %{buildroot}/%{kbd}/keymaps/xkb/cz.map.gz
patch %{buildroot}/%{kbd}/keymaps/xkb/cz.map < %{SOURCE15}
-gzip %{buildroot}/%{kbd}/keymaps/xkb/cz.map
+gzip -n9 %{buildroot}/%{kbd}/keymaps/xkb/cz.map
# Generate entries for systemd's /usr/share/systemd/kbd-model-map
mkdir -p %{buildroot}%{_datadir}/systemd
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2017-03-31 15:01:29
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is "kbd"
Fri Mar 31 15:01:29 2017 rev:81 rq:483842 version:2.0.3
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2017-02-16 16:46:33.401143275
+0100
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2017-03-31
15:01:32.111838517 +0200
@@ -1,0 +2,7 @@
+Thu Mar 23 23:23:20 UTC 2017 - zai...@opensuse.org
+
+- Revert dropping of kdb-legacy Requires: There are still packages
+ and installation flows that needs this to be present
+ (boo#1027379).
+
+---
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.nJ9rR6/_old 2017-03-31 15:01:33.963576748 +0200
+++ /var/tmp/diff_new_pack.nJ9rR6/_new 2017-03-31 15:01:33.963576748 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kbd
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,9 +20,9 @@
Version:2.0.3
Release:0
Summary:Keyboard and Font Utilities
+# git: git://git.altlinux.org/people/legion/packages/kbd.git
License:GPL-2.0+
Group: System/Console
-# git: git://git.altlinux.org/people/legion/packages/kbd.git
Url:ftp://ftp.altlinux.org/pub/people/legion/kbd/
# ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz repack_kbd.sh
Source: %{name}-%{version}-repack.tar.bz2
@@ -66,6 +66,8 @@
BuildRequires: suse-module-tools
BuildRequires: xkeyboard-config
BuildRequires: xz
+# Temporarily require -legacy
+Requires: %{name}-legacy = %{version}-%{release}
Requires(post): coreutils
Requires(postun): coreutils
Requires(pre): %fillup_prereq
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2017-02-16 16:46:31
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is "kbd"
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2016-07-27 16:07:30.0
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2017-02-16
16:46:33.401143275 +0100
@@ -1,0 +2,6 @@
+Sun Feb 12 23:37:52 UTC 2017 - zai...@opensuse.org
+
+- Drop kdb-legacy Requires: No longer needed, and was always meant
+ to be temporary.
+
+---
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.yz9GbP/_old 2017-02-16 16:46:34.369005837 +0100
+++ /var/tmp/diff_new_pack.yz9GbP/_new 2017-02-16 16:46:34.373005269 +0100
@@ -66,8 +66,6 @@
BuildRequires: suse-module-tools
BuildRequires: xkeyboard-config
BuildRequires: xz
-# Temporarily require -legacy
-Requires: %{name}-legacy = %{version}-%{release}
Requires(post): coreutils
Requires(postun): coreutils
Requires(pre): %fillup_prereq
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2016-07-27 16:07:28
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is "kbd"
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2016-07-10 18:46:30.0
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2016-07-27
16:07:30.0 +0200
@@ -1,0 +2,11 @@
+Tue Jul 12 12:52:31 UTC 2016 - tchva...@suse.com
+
+- Version update to 2.0.3:
+ * Various small updates
+- Obsolete merged patch:
+ * kbd-1.15.5-br-abnt2-slash-question.patch
+- Quickly run over with spec-cleaner
+- Remove arch check for alpha and other unused platforms
+- Drop kbd.fillup.nonpc as it should not be needed nowdays
+
+---
Old:
kbd-1.15.5-br-abnt2-slash-question.patch
kbd-2.0.2-repack.tar.bz2
kbd-2.0.2.tar.xz
kbd.fillup.nonpc
New:
kbd-2.0.3-repack.tar.bz2
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.8DfEEz/_old 2016-07-27 16:07:31.0 +0200
+++ /var/tmp/diff_new_pack.8DfEEz/_new 2016-07-27 16:07:31.0 +0200
@@ -17,23 +17,19 @@
Name: kbd
-Version:2.0.2
+Version:2.0.3
Release:0
Summary:Keyboard and Font Utilities
License:GPL-2.0+
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: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz
-%else
+# ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz repack_kbd.sh
Source: %{name}-%{version}-repack.tar.bz2
-%endif
Source1:kbd_fonts.tar.bz2
Source2:suse-add.tar.bz2
Source3:README.SUSE
Source5:kbd.fillup
-Source6:kbd.fillup.nonpc
Source8:sysconfig.console
Source9:sysconfig.keyboard
Source11: fbtest.c
@@ -59,27 +55,22 @@
# Patch13: adds xkb and legacy keymaps subdirs to loadkyes search path
# (openSUSE FATE#318355, sle FATE#318426)
Patch13:kbd-1.15.5-loadkeys-search-path.patch
-Patch14:kbd-1.15.5-br-abnt2-slash-question.patch
-
BuildRequires: automake
BuildRequires: bison
BuildRequires: check-devel
+BuildRequires: console-setup
BuildRequires: flex
BuildRequires: gcc >= 4.6
BuildRequires: pam-devel
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
BuildRequires: suse-module-tools
-BuildRequires: xz
-
-BuildRequires: console-setup
BuildRequires: xkeyboard-config
-
-Requires(pre): %fillup_prereq
-Requires(post): coreutils
-Requires(postun): coreutils
+BuildRequires: xz
# Temporarily require -legacy
Requires: %{name}-legacy = %{version}-%{release}
-
+Requires(post): coreutils
+Requires(postun): coreutils
+Requires(pre): %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -90,13 +81,6 @@
also includes fonts from the kbd_fonts.tar.gz package (by Paul
Gortmaker) on Sunsite.
-
-
-Authors:
-
-Andries Brouwer
-Alexey Gladkov
-
%package legacy
Summary:Legacy data for kbd package
Group: System/Console
@@ -106,9 +90,7 @@
The %{name}-legacy package contains original keymaps for kbd package.
Please note that %{name}-legacy is not helpful without kbd.
-
-
-%define kbd /usr/share/kbd
+%define kbd %{_datadir}/kbd
%prep
%setup -q -a 1 -a 2 -n kbd-%{version}
@@ -126,7 +108,6 @@
%patch11
%patch12 -p1
%patch13 -p1
-%patch14 -p1
%build
for i in `find data/keymaps/mac -type f` ; do
@@ -145,19 +126,20 @@
test -f qwerty/cz.map || mv qwerty/cz.map qwerty/cz-qwerty.map
popd
%configure \
+ --disable-silent-rules \
--datadir=%{kbd} \
--enable-nls \
- --localedir=/usr/share/locale \
+ --localedir=%{_datadir}/locale \
--enable-optional-progs \
--disable-vlock
-make CFLAGS="%{optflags}"
+make %{?_smp_mflags}
gcc %{optflags} -o fbtest $RPM_SOURCE_DIR/fbtest.c
# fix lat2-16.psfu (bnc#340579)
font=data/consolefonts/lat2a-16.psfu
./src/psfxtable -i $font -it data/unimaps/lat2u.uni \
-o t.psfu
mv t.psfu $font
-make
+make %{?_smp_mflags}
%install
mkdir -p %{buildroot}%{_sbindir}
@@ -182,7 +164,7 @@
mkdir -p $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
+echo "See
commit kbd for openSUSE:Factory
Hello community, here is the log from the commit of package kbd for openSUSE:Factory checked in at 2016-07-10 18:46:29 Comparing /work/SRC/openSUSE:Factory/kbd (Old) and /work/SRC/openSUSE:Factory/.kbd.new (New) Package is "kbd" Changes: --- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2015-12-18 21:49:59.0 +0100 +++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2016-07-10 18:46:30.0 +0200 @@ -1,0 +2,6 @@ +Thu Jun 16 00:18:55 CET 2016 - marceloa...@gmail.com + +- Fix data/keymaps/i386/querty/br-abnt2.map + (boo#984958, kbd-1.15.5-br-abnt2-slash-question.patch) + +--- New: kbd-1.15.5-br-abnt2-slash-question.patch Other differences: -- ++ kbd.spec ++ --- /var/tmp/diff_new_pack.0zaeQa/_old 2016-07-10 18:46:32.0 +0200 +++ /var/tmp/diff_new_pack.0zaeQa/_new 2016-07-10 18:46:32.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package kbd # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -59,6 +59,7 @@ # Patch13: adds xkb and legacy keymaps subdirs to loadkyes search path # (openSUSE FATE#318355, sle FATE#318426) Patch13:kbd-1.15.5-loadkeys-search-path.patch +Patch14:kbd-1.15.5-br-abnt2-slash-question.patch BuildRequires: automake BuildRequires: bison @@ -125,6 +126,7 @@ %patch11 %patch12 -p1 %patch13 -p1 +%patch14 -p1 %build for i in `find data/keymaps/mac -type f` ; do ++ kbd-1.15.5-br-abnt2-slash-question.patch ++ --- kbd-1.15.5/data/keymaps/i386/qwerty/br-abnt2.map.orig 2012-12-01 19:41:38.0 -0200 +++ kbd-1.15.5/data/keymaps/i386/qwerty/br-abnt2.map2016-06-16 00:18:55.745193940 -0300 @@ -88,3 +88,6 @@ keycode 125 = Scroll_Backward keycode 126 = Scroll_Forward keycode 127 = Compose + + altgr keycode 16 = slash + altgr keycode 17 = question
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2015-12-18 21:49:58
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is "kbd"
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2015-09-27 14:31:04.0
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2015-12-18
21:49:59.0 +0100
@@ -1,0 +2,6 @@
+Thu Dec 10 16:31:10 CET 2015 - ti...@suse.de
+
+- Fix missing dependency on coreutils for initrd macros (boo#958562)
+- Call missing initrd macro at postun (boo#958562)
+
+---
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.OcVitt/_old 2015-12-18 21:50:01.0 +0100
+++ /var/tmp/diff_new_pack.OcVitt/_new 2015-12-18 21:50:01.0 +0100
@@ -74,6 +74,8 @@
BuildRequires: xkeyboard-config
Requires(pre): %fillup_prereq
+Requires(post): coreutils
+Requires(postun): coreutils
# Temporarily require -legacy
Requires: %{name}-legacy = %{version}-%{release}
@@ -367,6 +369,9 @@
#echo "See /etc/sysconfig/console, /etc/sysconfig/keyboard"
#echo "and {_docdir}/kbd/README.SUSE."
+%postun
+%{?regenerate_initrd_post}
+
%posttrans
%{?regenerate_initrd_posttrans}
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2015-09-27 14:31:46
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is "kbd"
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2015-04-10 09:49:14.0
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2015-09-27
14:31:04.0 +0200
@@ -1,0 +2,40 @@
+Fri Aug 21 10:50:21 UTC 2015 - opensuse.lietuviu.ka...@gmail.com
+
+- Rename conflicting legacy keymaps:
+ * dvorak/no.map -> dvorak/no-dvorak.map
+ * fgGIod/trf.map -> fgGIod/trf-fgGIod.map
+ * olpc/pt.map -> olpc/pt-olpc.map
+ * qwerty/cz.map -> qwerty/cz-qwerty.map
+- i386/qwerty/sr-latin links to sr-cy
+- add compose rules to cz layout (rh#1181581)
+
+---
+Mon Aug 10 11:53:48 UTC 2015 - sndir...@suse.com
+
+- genmap4systemd.sh: use 'abnt2' model for 'br' layouts, 'jp106'
+ model for 'jp' layouts and 'microsoftpro' for anything else
+ (instead of 'pc105' before) (FATE#318426)
+
+---
+Tue Jul 21 10:05:35 UTC 2015 - sndir...@suse.com
+
+- added genmap4systemd.sh tool, which generates entries for
+ systemd's /usr/share/systemd/kbd-model-map table from
+ xkeyboard-config converted keymaps; entries are written to
+ /usr/share/systemd/kbd-model-map.xkb-generated, so these can
+ easily be added to /usr/share/systemd/kbd-model-map by systemd
+ package (FATE#318426)
+
+---
+Fri Jul 17 12:54:27 UTC 2015 - sndir...@suse.com
+
+- Include xkb layouts from xkeyboard-config converted to console
+ keymaps, (FATE#318426)
+ * Rename Finnish xkb converted layout
+ * Add xkb and legacy keymaps subdirs to loadkyes search path
+(kbd-1.15.5-loadkeys-search-path.patch), remove symlinks,
+Don't convert layouts that can't input ASCII,
+ * Original keymaps moved to legacy dir, created symlinks to xkb
+keymaps
+
+---
New:
cz-map.patch
genmap4systemd.sh
kbd-1.15.5-loadkeys-search-path.patch
xml2lst.pl
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.zG0YNA/_old 2015-09-27 14:31:06.0 +0200
+++ /var/tmp/diff_new_pack.zG0YNA/_new 2015-09-27 14:31:06.0 +0200
@@ -40,8 +40,11 @@
Source12: fbtest.8
Source13: guess_encoding.pl
Source14: kbd.pl
+Source15: cz-map.patch
Source42: convert-kbd-mac.sed
Source43: repack_kbd.sh
+Source44: xml2lst.pl
+Source45: genmap4systemd.sh
Patch0: kbd-1.15.2-prtscr_no_sigquit.patch
Patch2: kbd-1.15.2-unicode_scripts.patch
Patch3: kbd-1.15.2-docu-X11R6-xorg.patch
@@ -53,6 +56,9 @@
Patch10:kbd-2.0.2-doshell-reference.patch
Patch11:kbd-2.0.2-euro-unicode.patch
Patch12:kbd-2.0.2-fix-bashisms.patch
+# Patch13: adds xkb and legacy keymaps subdirs to loadkyes search path
+# (openSUSE FATE#318355, sle FATE#318426)
+Patch13:kbd-1.15.5-loadkeys-search-path.patch
BuildRequires: automake
BuildRequires: bison
@@ -63,7 +69,13 @@
BuildRequires: pkg-config
BuildRequires: suse-module-tools
BuildRequires: xz
+
+BuildRequires: console-setup
+BuildRequires: xkeyboard-config
+
Requires(pre): %fillup_prereq
+# Temporarily require -legacy
+Requires: %{name}-legacy = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -82,10 +94,23 @@
Andries Brouwer
Alexey Gladkov
+%package legacy
+Summary:Legacy data for kbd package
+Group: System/Console
+BuildArch: noarch
+
+%description legacy
+The %{name}-legacy package contains original keymaps for kbd package.
+Please note that %{name}-legacy is not helpful without kbd.
+
+
+
%define kbd /usr/share/kbd
%prep
%setup -q -a 1 -a 2 -n kbd-%{version}
+cp -fp %{SOURCE44} .
+cp -fp %{SOURCE45} .
%patch0 -p1
%patch2
%patch3
@@ -97,6 +122,7 @@
%patch10
%patch11
%patch12 -p1
+%patch13 -p1
%build
for i in `find data/keymaps/mac -type f` ; do
@@ -108,6 +134,11 @@
test -f qwerty/se-latin1.map || cp qwerty/sv-latin1.map
qwerty/se-latin1.map
# bnc#435121
test -f olpc/es-olpc.map || mv olpc/es.map olpc/es-olpc.map
+# Rename conflicting keymaps, as Fedora do
+test -f dvorak/no.map || mv dvorak/no.map dvorak/no-dvorak.map
+test -f fgGIod/trf.map || mv fgGIod/trf.map fgGIod/trf-fgGIod.map
+test -f olpc/pt.map || mv olpc/pt.map olpc/pt-olpc.map
+test -f qwerty/cz.map || mv qwerty/cz.map
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2015-04-06 00:23:26
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is kbd
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2015-02-20 12:42:54.0
+0100
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2015-04-06
00:23:27.0 +0200
@@ -1,0 +2,6 @@
+Sat Mar 28 21:15:08 UTC 2015 - crrodrig...@opensuse.org
+
+- Regenerate the initrd if this package changes as it is
+ included there for early console setup.
+
+---
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.FbT5F9/_old 2015-04-06 00:23:29.0 +0200
+++ /var/tmp/diff_new_pack.FbT5F9/_new 2015-04-06 00:23:29.0 +0200
@@ -291,10 +291,14 @@
%post
%{fillup_only -n console}
%{fillup_only -n keyboard}
+%{?regenerate_initrd_post}
#echo Please read the docu about the new COMPOSETABLE rc.config variable.
#echo See /etc/sysconfig/console, /etc/sysconfig/keyboard
#echo and {_docdir}/kbd/README.SUSE.
+%posttrans
+%{?regenerate_initrd_posttrans}
+
%files -f %{name}.lang
%defattr(-,root,root)
#config(noreplace) /etc/sysconfig/console
commit kbd for openSUSE:Factory
Hello community, here is the log from the commit of package kbd for openSUSE:Factory checked in at 2015-01-23 16:17:23 Comparing /work/SRC/openSUSE:Factory/kbd (Old) and /work/SRC/openSUSE:Factory/.kbd.new (New) Package is kbd Changes: --- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2014-09-28 19:56:46.0 +0200 +++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2015-01-23 16:17:25.0 +0100 @@ -1,0 +2,9 @@ +Sat Nov 29 22:14:00 UTC 2014 - Led led...@gmail.com + +- fix bashisms in scripts +- add patches: + * kbd-2.0.2-fix-bashisms.patch +- update patches: + * kbd-1.15.2-unicode_scripts.patch + +--- New: kbd-2.0.2-fix-bashisms.patch Other differences: -- ++ kbd.spec ++ --- /var/tmp/diff_new_pack.8gW70d/_old 2015-01-23 16:17:27.0 +0100 +++ /var/tmp/diff_new_pack.8gW70d/_new 2015-01-23 16:17:27.0 +0100 @@ -52,6 +52,7 @@ Patch9: kbd-2.0.2-comment-typo-qwerty.patch Patch10:kbd-2.0.2-doshell-reference.patch Patch11:kbd-2.0.2-euro-unicode.patch +Patch12:kbd-2.0.2-fix-bashisms.patch BuildRequires: automake BuildRequires: bison @@ -95,6 +96,7 @@ %patch9 %patch10 %patch11 +%patch12 -p1 %build for i in `find data/keymaps/mac -type f` ; do ++ kbd-1.15.2-unicode_scripts.patch ++ --- /var/tmp/diff_new_pack.8gW70d/_old 2015-01-23 16:17:27.0 +0100 +++ /var/tmp/diff_new_pack.8gW70d/_new 2015-01-23 16:17:27.0 +0100 @@ -35,7 +35,7 @@ + fi + setfont $SETFONT_ARGS + if [ -n $CONSOLE_MAGIC -a $CONSOLE_MAGIC != none ] ; then -+ echo -en \033$CONSOLE_MAGIC ++ printf \033$CONSOLE_MAGIC + fi + else + setfont $DEFAULT_UNICODE_FONT ++ kbd-2.0.2-fix-bashisms.patch ++ diff -Ndurp kbd-2.0.2/contrib/font2psf kbd-2.0.2-fix-bashisms/contrib/font2psf --- kbd-2.0.2/contrib/font2psf 2012-02-27 12:27:10.0 +0200 +++ kbd-2.0.2-fix-bashisms/contrib/font2psf 2014-10-19 23:07:11.719239190 +0300 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh #written by Martin Lohner, SuSE GmbH, Dec 1998 echo This script converts 256 character font to psf-fonts echo It simply assumes that all files in the current directory @@ -15,24 +15,21 @@ read a random=hfdsvnpoh97k if [ $a = y -o $a = Y ] ; then echo Creating psf-headers... - echo -ne \066 $random - echo -ne \004 $random - echo -ne \000 $random + printf \066\004\000 $random - - echo -ne \006 $random.6.tmp + printf \006 $random.6.tmp cat $random $random.6.tmp $random.6 - echo -ne \010 $random.8.tmp + printf \010 $random.8.tmp cat $random $random.8.tmp $random.8 - echo -ne \012 $random.10.tmp + printf \012 $random.10.tmp cat $random $random.10.tmp $random.10 - echo -ne \014 $random.12.tmp + printf \014 $random.12.tmp cat $random $random.12.tmp $random.12 - echo -ne \016 $random.14.tmp + printf \016 $random.14.tmp cat $random $random.14.tmp $random.14 - echo -ne \020 $random.16.tmp + printf \020 $random.16.tmp cat $random $random.16.tmp $random.16 - echo -ne \023 $random.19.tmp + printf \023 $random.19.tmp cat $random $random.19.tmp $random.19 for i in 6 8 10 12 14 16 19; do diff -Ndurp kbd-2.0.2/contrib/psfsplit kbd-2.0.2-fix-bashisms/contrib/psfsplit --- kbd-2.0.2/contrib/psfsplit 2012-02-27 12:27:10.0 +0200 +++ kbd-2.0.2-fix-bashisms/contrib/psfsplit 2014-10-19 22:53:02.271296655 +0300 @@ -11,17 +11,17 @@ thenecho $1 -- non .psf file exit fi size=`hexdump -e '/1 %i ' -n1 -s2 $1 ` -size=$[ ($size % 2 + 1) * 256 ] +size=$((($size % 2 + 1) * 256)) height=`hexdump -e '/1 %i ' -n1 -s3 $1 ` echo $size chars, height=$height mkdir $1_ -dd bs=4 count=1 if=$1 of=$1_/#psf_header /dev/null +dd bs=4 count=1 if=$1 of=$1_/#psf_header /dev/null 21 i=0 -while let $[ i $size ] +while [ $i -lt $size ] do - dd bs=1 count=$height skip=$[ $i * $height + 4 ] if=$1 \ - of=$1_/`printf %.3x $i` /dev/null - let i+=1 + dd bs=1 count=$height skip=$(($i * $height + 4)) if=$1 \ + of=$1_/`printf %.3x $i` /dev/null 21 + i=$((i + 1)) done -dd bs=1 skip=$[ $i * $height + 4 ] if=$1 of=$1_/map_tables /dev/null +dd bs=1 skip=$(($i * $height + 4)) if=$1 of=$1_/map_tables /dev/null 21 diff -Ndurp kbd-2.0.2/contrib/showconsolefont kbd-2.0.2-fix-bashisms/contrib/showconsolefont --- kbd-2.0.2/contrib/showconsolefont 2012-02-27
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2014-09-28 19:56:40
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is kbd
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2014-09-20 07:26:41.0
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2014-09-28
19:56:46.0 +0200
@@ -1,0 +2,8 @@
+Thu Sep 25 10:33:55 UTC 2014 - pgaj...@suse.com
+
+- euro{,1,2}.map now produces correct unicode for Euro sign
+ [bnc#360993]
+- added patches:
+ * kbd-2.0.2-euro-unicode.patch
+
+---
New:
kbd-2.0.2-euro-unicode.patch
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.NLEcfy/_old 2014-09-28 19:56:47.0 +0200
+++ /var/tmp/diff_new_pack.NLEcfy/_new 2014-09-28 19:56:47.0 +0200
@@ -51,6 +51,7 @@
Patch6: kbd-1.15.2-dumpkeys-C-opt.patch
Patch9: kbd-2.0.2-comment-typo-qwerty.patch
Patch10:kbd-2.0.2-doshell-reference.patch
+Patch11:kbd-2.0.2-euro-unicode.patch
BuildRequires: automake
BuildRequires: bison
@@ -93,6 +94,7 @@
%patch6
%patch9
%patch10
+%patch11
%build
for i in `find data/keymaps/mac -type f` ; do
++ kbd-2.0.2-euro-unicode.patch ++
Index: data/keymaps/i386/include/euro.map
===
--- data/keymaps/i386/include/euro.map.orig 2012-02-27 11:27:10.0
+0100
+++ data/keymaps/i386/include/euro.map 2014-09-25 12:31:37.594749095 +0200
@@ -2,5 +2,5 @@
# [Say: loadkeys euro to get Euro and cent with Alt on the positions
# where many keyboards have E and C.
# To get it displayed, use a latin0 (i.e., latin9) font.]
-alt keycode 18 = currency
+alt keycode 18 = euro
alt keycode 46 = cent
Index: data/keymaps/i386/include/euro1.map
===
--- data/keymaps/i386/include/euro1.map.orig2012-02-27 11:27:10.0
+0100
+++ data/keymaps/i386/include/euro1.map 2014-09-25 12:31:20.218749689 +0200
@@ -2,5 +2,5 @@
# [Say: loadkeys euro1 to get Euro and cent with AltGr (right alt)
# on the positions where many keyboards have 5 and C.
# To get it displayed, use a latin0 (i.e., latin9) font.]
-altgr keycode 6 = currency
+altgr keycode 6 = euro
altgr keycode 46 = cent
Index: data/keymaps/i386/include/euro2.map
===
--- data/keymaps/i386/include/euro2.map.orig2012-02-27 11:27:10.0
+0100
+++ data/keymaps/i386/include/euro2.map 2014-09-25 12:31:52.098748600 +0200
@@ -2,5 +2,5 @@
# [Say: loadkeys euro2 to get Euro and cent with AltGr (right alt)
# on the positions where many keyboards have E and C.
# To get it displayed, use a latin0 (i.e., latin9) font.]
-altgr keycode 18 = currency
+altgr keycode 18 = euro
altgr keycode 46 = cent
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2014-09-20 07:26:40
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is kbd
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2014-09-17 21:23:37.0
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2014-09-20
07:26:41.0 +0200
@@ -1,0 +2,13 @@
+Thu Sep 18 10:54:51 UTC 2014 - pgaj...@suse.com
+
+- port dumpkeys-C-opt.patch
+- modified patches:
+ * kbd-1.15.2-dumpkeys-C-opt.patch
+
+---
+Fri Sep 12 09:52:30 UTC 2014 - pgaj...@suse.com
+
+- kbd-2.0.2-doshell-reference.patch:
+ drop doshell reference from openvt.1 man page [bnc#675317]
+
+---
New:
kbd-2.0.2-doshell-reference.patch
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.hnzMca/_old 2014-09-20 07:26:43.0 +0200
+++ /var/tmp/diff_new_pack.hnzMca/_new 2014-09-20 07:26:43.0 +0200
@@ -50,6 +50,7 @@
# TODO: no ideas how to port it.
Patch6: kbd-1.15.2-dumpkeys-C-opt.patch
Patch9: kbd-2.0.2-comment-typo-qwerty.patch
+Patch10:kbd-2.0.2-doshell-reference.patch
BuildRequires: automake
BuildRequires: bison
@@ -89,8 +90,9 @@
%patch4 -p1
%patch5 -p1
# TODO: no ideas how to port it.
-# %%patch6
+%patch6
%patch9
+%patch10
%build
for i in `find data/keymaps/mac -type f` ; do
++ kbd-1.15.2-dumpkeys-C-opt.patch ++
--- /var/tmp/diff_new_pack.hnzMca/_old 2014-09-20 07:26:43.0 +0200
+++ /var/tmp/diff_new_pack.hnzMca/_new 2014-09-20 07:26:43.0 +0200
@@ -1,7 +1,7 @@
-Index: man/man1/dumpkeys.1.in
+Index: docs/man/man1/dumpkeys.1.in
===
man/man1/dumpkeys.1.in.orig
-+++ man/man1/dumpkeys.1.in
+--- docs/man/man1/dumpkeys.1.in.orig 2013-08-27 22:45:33.0 +0200
docs/man/man1/dumpkeys.1.in2014-09-12 13:42:01.557871837 +0200
@@ -4,6 +4,7 @@
dumpkeys \- dump keyboard translation tables
.SH SYNOPSIS
@@ -10,7 +10,7 @@
[
.B \-hilfn
.BI \-c charset
-@@ -197,6 +198,12 @@ This option produces an output line `cha
+@@ -197,6 +198,12 @@
loadkeys how to interpret the keymap. (For example, division is
0xf7 in iso-8859-1 but 0xba in iso-8859-8.)
.LP
@@ -25,35 +25,27 @@
.TP 20
Index: src/dumpkeys.c
===
src/dumpkeys.c.orig
-+++ src/dumpkeys.c
-@@ -31,6 +31,7 @@
- static int fd;
- static int verbose;
- static int nr_keys = 0; /* probably 112, 128, 256 or
512 */
-+static char * console;
-
- int keymap_index[MAX_NR_KEYMAPS]; /* inverse of good_keymap */
- int good_keymap[MAX_NR_KEYMAPS], keymapnr, allocct;
-@@ -582,6 +583,8 @@ valid options are:\n\
+--- src/dumpkeys.c.orig2014-06-15 20:33:18.0 +0200
src/dumpkeys.c 2014-09-12 13:47:09.633866557 +0200
+@@ -41,6 +41,8 @@
--funcs-only display only the function key strings\n\
--keys-only display only key bindings\n\
--compose-only display only compose key combinations\n\
+ -C vc\n\
+ --console=vc Indicate the virtual console device to be used.\n\
-c --charset=));
- list_charsets(stderr);
+ lk_list_charsets(stderr);
fprintf(stderr, _(\
-@@ -593,7 +596,7 @@ valid options are:\n\
+@@ -52,7 +54,7 @@
int
main (int argc, char *argv[]) {
-- const char *short_opts = hilvsnf1S:c:V;
-+ const char *short_opts = hilvsnf1S:c:C:V;
+- const char *short_opts = hilvsnf1tkdS:c:V;
++ const char *short_opts = hilvsnf1tkdS:C:c:V;
const struct option long_opts[] = {
{ help, no_argument,NULL, 'h' },
{ short-info, no_argument,NULL, 'i' },
-@@ -606,6 +609,7 @@ main (int argc, char *argv[]) {
+@@ -65,6 +67,7 @@
{ keys-only, no_argument,NULL, 'k' },
{ compose-only,no_argument, NULL, 'd' },
{ charset,required_argument, NULL, 'c' },
@@ -61,8 +53,16 @@
{ verbose,no_argument,NULL, 'v' },
{ version,no_argument,NULL, 'V' },
{ NULL, 0, NULL, 0 }
-@@ -665,6 +669,9 @@ main (int argc, char *argv[]) {
- usage();
+@@ -79,6 +82,7 @@
+ char funcs_only = 0;
+ char keys_only = 0;
+ char diac_only = 0;
++char * console = NULL;
+
+ struct lk_ctx *ctx;
+
+@@ -135,6 +139,9 @@
+
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2014-09-17 21:23:36
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is kbd
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2014-08-25 11:54:35.0
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2014-09-17
21:23:37.0 +0200
@@ -1,0 +2,6 @@
+Thu Sep 4 17:51:54 UTC 2014 - j...@owncloud.com
+
+- added /usr/bin/kbd, a simple userfriedly keymap switcher.
+ From https://github.com/jnweiger/kbd-wrapper
+
+---
New:
kbd.pl
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.LGAwP6/_old 2014-09-17 21:23:38.0 +0200
+++ /var/tmp/diff_new_pack.LGAwP6/_new 2014-09-17 21:23:38.0 +0200
@@ -39,6 +39,7 @@
Source11: fbtest.c
Source12: fbtest.8
Source13: guess_encoding.pl
+Source14: kbd.pl
Source42: convert-kbd-mac.sed
Source43: repack_kbd.sh
Patch0: kbd-1.15.2-prtscr_no_sigquit.patch
@@ -230,6 +231,7 @@
install -m 755 fbtest%{buildroot}/%{_sbindir}
install -m 644 %{SOURCE12} %{buildroot}/%{_mandir}/man8/
install -m 755 %{SOURCE13} %{buildroot}/%{_bindir}/guess_encoding
+install -m 755 %{SOURCE14} %{buildroot}/%{_bindir}/kbd
#UsrMerge
mkdir -p %{buildroot}/bin
mkdir -p %{buildroot}/sbin
@@ -376,6 +378,7 @@
%{_bindir}/unicode_stop
%{_bindir}/kbdrate
%{_bindir}/guess_encoding
+%{_bindir}/kbd
%{_bindir}/clrunimap
%{_bindir}/getunimap
%{_bindir}/outpsfheader
++ kbd.pl ++
#! /usr/bin/perl -w
#
# simple script to switch the keyboard language
# (c) 2014 j...@owncloud.om
my $sysconffile = '/etc/sysconfig/keyboard';
my $mapdir = '/usr/share/kbd/keymaps/i386';
my $version = '1.0';
my $what = shift || '-h';
my $v = slurp_sysconf($sysconffile);
my $m = find_maps();
my $l = {
'english' = 'us.map',
'german' = 'de-latin1-nodeadkeys.map',
'french' = 'fr-latin1.map',
'spanish' = 'es.map',
'italian' = 'it.map',
'dutch' = 'nl.map',
};
for my $k (keys %$l)
{
# zap non-installed languages from our pretty printed list.
delete $l-{$k} unless $m-{$l-{$k}} or $m-{$l-{$k}.gz};
}
if ($what eq '-h')
{
print qq{kbd Version $version
Usage: $0 [option] [mapping]
Available options are:
-llist typical language mappings.
-alist all maps
-hprint this usage
Specify as a mapping either a language name (seen with -l)
or a mapping name (seen with -a). For a mapping name, add a .map suffix.
Current keymap: $v-{KEYTABLE}
};
exit 0;
}
if ($what eq '-l')
{
for my $k (sort keys %$l)
{
printf %-10s %s\n, $k, $l-{$k};
}
exit 0;
}
if ($what eq '-a' || $what eq '-m')
{
my @k = map { $1 if /(.*).map(.gz)?$/ } sort keys %$m;
print current keymap: $v-{KEYTABLE}\n;
print available keymaps: @k\n;
print \n\nuse '$0 MAPNAME' to change.\n;
exit 0;
}
$what = $l-{$what} if $l-{$what};
$what = $what.gz if $m-{$what.gz};
$what = $what.mapif $m-{$what.map};
$what = $what.map.gz if $m-{$what.map.gz};
die $what: keymap not found.\n Try $0 -h\n unless $m-{$what};
write_sysconf($sysconffile, { 'KEYTABLE' = $what } );
# system(kbd_mode -u);# switch to unicode. Should be the
default anyway.
system(loadkeys $what); # now set the keymap.
# FIXME: is that all?
# mayb also do: systemctl restart kbd.service
exit 0;
###
sub find_maps
{
my $maps;
opendir DIR, $mapdir or die $0: cannot readdir $mapdir: !$\n;
my @d = grep { -d $mapdir/$_ !/^\./ } readdir DIR;
closedir DIR;
for my $d (@d)
{
opendir DIR, $mapdir/$d or die $0: cannot readdir $mapdir/$d: !$\n;
my @f = grep { /\.map(.gz)?$/ } readdir DIR;
closedir DIR;
for my $f (@f)
{
$maps-{$f} = $d/$f;
}
}
return $maps;
}
sub slurp_sysconf
{
my ($file) = @_;
my $vals;
open my $fd, , $file or die $0: cannot read config file $file: $!\n;
while (defined(my $line = $fd))
{
chomp $line;
$vals-{$1} = $2 if $line =~ m{^([A-Z_]+)\s*=\s*(.*)};
}
close $fd;
return $vals;
}
sub write_sysconf
{
my ($file, $vals) = @_;
my @sysconf = ();
open my $fd, , $file or die $0: cannot read config file $file: $!\n;
while (defined(my $line = $fd))
{
chomp $line;
push @sysconf, $line;
}
close $fd;
open $fd, , $file or die $0: cannot write config file $file: $!\n;
for my $line (@sysconf)
{
if ($line =~ m{^([A-Z_]+)\s*=\s*(.*)})
{
my ($keyword,$value) =
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2014-08-25 11:54:33
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is kbd
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2014-07-26 11:28:01.0
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2014-08-25
11:54:35.0 +0200
@@ -1,0 +2,41 @@
+Fri Aug 22 09:50:15 UTC 2014 - pgaj...@suse.com
+
+- drop kbd-1.15.2-chvt-userwait.patch [bnc#830805] (internal)
+ (--userwait seems to not be used anywhere)
+
+---
+Fri Aug 22 09:25:51 UTC 2014 - pgaj...@suse.com
+
+- remove testutf8 stub (2009: testutf8 will be soon removed completely,
+ it's kept only not to break /etc/profile currently)
+
+---
+Fri Aug 22 06:51:23 UTC 2014 - pgaj...@suse.com
+
+- Update to version 2.0.2:
+ libkeymap: fix kmap on big-endian machines
+ Add functions to get the total number of elements
+ Add functions to convert ksyms
+ eurlatgr - new Linux console font
+ Hide syms array
+ Add information about the total number of elements
+ Add function to obtain items from the diacritical table
+ Change the API for working with the diacritical table
+ Change API for working with list of functions
+ Add functions to check diacr/func existance
+ Add pancyrillic font
+ po: Update translations (from translationproject.org)
+ vlock: implement PAM account and password management
+ vlock: rename ERROR_TIMEOUT macro to LONG_DELAY
+ vlock: introduce short delays after non-fatal PAM errors
+ Added Latvian keymap
+ (changelog taken from
+ http://lists.altlinux.org/pipermail/kbd/2014-July/000476.html)
+- add kbd-2.0.2-comment-typo-qwerty.patch [bnc#825385]
+
+---
+Wed Aug 20 16:47:44 UTC 2014 - pgaj...@suse.com
+
+- SuSE - SUSE [bnc#889035]
+
+---
Old:
README.SuSE
kbd-1.15.2-chvt-userwait.patch
kbd-2.0.1-repack.tar.bz2
kbd-2.0.1.tar.xz
testutf8
New:
README.SUSE
kbd-2.0.2-comment-typo-qwerty.patch
kbd-2.0.2-repack.tar.bz2
kbd-2.0.2.tar.xz
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.Gwu0TB/_old 2014-08-25 11:54:36.0 +0200
+++ /var/tmp/diff_new_pack.Gwu0TB/_new 2014-08-25 11:54:36.0 +0200
@@ -17,7 +17,7 @@
Name: kbd
-Version:2.0.1
+Version:2.0.2
Release:0
Summary:Keyboard and Font Utilities
License:GPL-2.0+
@@ -31,12 +31,11 @@
%endif
Source1:kbd_fonts.tar.bz2
Source2:suse-add.tar.bz2
-Source3:README.SuSE
+Source3:README.SUSE
Source5:kbd.fillup
Source6:kbd.fillup.nonpc
Source8:sysconfig.console
Source9:sysconfig.keyboard
-Source10: testutf8
Source11: fbtest.c
Source12: fbtest.8
Source13: guess_encoding.pl
@@ -49,7 +48,7 @@
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
+Patch9: kbd-2.0.2-comment-typo-qwerty.patch
BuildRequires: automake
BuildRequires: bison
@@ -90,7 +89,7 @@
%patch5 -p1
# TODO: no ideas how to port it.
# %%patch6
-%patch8 -p1
+%patch9
%build
for i in `find data/keymaps/mac -type f` ; do
@@ -228,7 +227,6 @@
rm -f %{buildroot}/%{_mandir}/man8/getkeycodes.8*
rm -f %{buildroot}/%{_mandir}/man8/setkeycodes.8*
%endif
-install -m 755 %_sourcedir/testutf8 %{buildroot}/%{_bindir}
install -m 755 fbtest%{buildroot}/%{_sbindir}
install -m 644 %{SOURCE12} %{buildroot}/%{_mandir}/man8/
install -m 755 %{SOURCE13} %{buildroot}/%{_bindir}/guess_encoding
@@ -266,7 +264,6 @@
ln -s %{_bindir}/showkey %{buildroot}/bin
ln -s %{_bindir}/spawn_console %{buildroot}/bin
ln -s %{_bindir}/spawn_login %{buildroot}/bin
-ln -s %{_bindir}/testutf8 %{buildroot}/bin
ln -s %{_bindir}/unicode_start %{buildroot}/bin
ln -s %{_bindir}/unicode_stop %{buildroot}/bin
ln -s %{_sbindir}/fbtest %{buildroot}/sbin
@@ -288,7 +285,7 @@
%{fillup_only -n keyboard}
#echo Please read the docu about the new COMPOSETABLE rc.config variable.
#echo See /etc/sysconfig/console, /etc/sysconfig/keyboard
-#echo and {_docdir}/kbd/README.SuSE.
+#echo and {_docdir}/kbd/README.SUSE.
%files -f %{name}.lang
%defattr(-,root,root)
@@ -333,7 +330,6 @@
/bin/unicode_start
/bin/unicode_stop
/bin/kbdrate
-/bin/testutf8
/bin/guess_encoding
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2014-07-26 11:27:53
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is kbd
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2014-03-16 08:05:11.0
+0100
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2014-07-26
11:28:01.0 +0200
@@ -1,0 +2,6 @@
+Thu Jul 24 20:31:47 UTC 2014 - dims...@opensuse.org
+
+- No longer recommend fbset: the package does no longer exist in
+ openSUSE since late 2013.
+
+---
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.Ho6Rqf/_old 2014-07-26 11:28:02.0 +0200
+++ /var/tmp/diff_new_pack.Ho6Rqf/_new 2014-07-26 11:28:02.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kbd
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -61,7 +61,6 @@
BuildRequires: xz
Requires(pre): %fillup_prereq
-Recommends: fbset
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2014-03-16 08:05:07
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is kbd
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2013-04-05 07:36:33.0
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2014-03-16
08:05:11.0 +0100
@@ -1,0 +2,28 @@
+Sun Nov 3 17:51:09 UTC 2013 - dap.darkn...@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.darkn...@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
+
+---
Old:
kbd-1.15.2-dumpkeys-ppc.patch
kbd-1.15.5-repack.tar.bz2
kbd-1.15.5.tar.gz
New:
kbd-2.0.1-repack.tar.bz2
kbd-2.0.1.tar.xz
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.6VOdSX/_old 2014-03-16 08:05:12.0 +0100
+++ /var/tmp/diff_new_pack.6VOdSX/_new 2014-03-16 08:05:12.0 +0100
@@ -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 @@
# 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 @@
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 @@
%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 @@
# 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/
++ kbd-1.15.2-chvt-userwait.patch ++
--- /var/tmp/diff_new_pack.6VOdSX/_old 2014-03-16 08:05:12.0 +0100
+++ /var/tmp/diff_new_pack.6VOdSX/_new 2014-03-16 08:05:12.0 +0100
@@ -8,8 +8,8 @@
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
++ kbd-1.15.2-docu-X11R6-xorg.patch
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2013-04-05 07:32:47
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is kbd, Maintainer is sbra...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2012-12-07 14:17:30.0
+0100
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2013-04-05
07:36:33.0 +0200
@@ -1,0 +2,17 @@
+Thu Apr 4 15:57:45 UTC 2013 - meiss...@suse.com
+
+- disable vlock build, which is in vlock package.
+
+---
+Thu Apr 4 01:34:32 UTC 2013 - crrodrig...@opensuse.org
+
+- Remove sysvinit support, init scripts from this package
+ are masked by systemd and only serve for confusion.
+
+---
+Wed Apr 3 19:06:41 CEST 2013 - sbra...@suse.cz
+
+- sysconfig.keyboard: Updated description of KBD_NUMLOCK
+ (bnc#746595#c74).
+
+---
Old:
kbd.init
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.Axb3dn/_old 2013-04-05 07:36:37.0 +0200
+++ /var/tmp/diff_new_pack.Axb3dn/_new 2013-04-05 07:36:37.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kbd
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -32,7 +32,6 @@
Source1:kbd_fonts.tar.bz2
Source2:suse-add.tar.bz2
Source3:README.SuSE
-Source4:kbd.init
Source5:kbd.fillup
Source6:kbd.fillup.nonpc
Source8:sysconfig.console
@@ -58,8 +57,6 @@
BuildRequires: pam-devel
Requires(pre): %fillup_prereq
-Requires(pre): %insserv_prereq
-
Recommends: fbset
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -107,8 +104,9 @@
--datadir=%{kbd} \
--enable-nls \
--localedir=/usr/share/locale \
- --enable-optional-progs
-make CFLAGS=%{optflags} -Os
+ --enable-optional-progs \
+ --disable-vlock
+make CFLAGS=%{optflags}
gcc %{optflags} -o fbtest $RPM_SOURCE_DIR/fbtest.c
# fix lat2-16.psfu (bnc#340579)
font=data/consolefonts/lat2a-16.psfu
@@ -119,7 +117,6 @@
%install
mkdir -p %{buildroot}%{_sbindir}
-mkdir -p %{buildroot}%{_sysconfdir}/init.d
DOC=%{buildroot}%{_defaultdocdir}/kbd
KBD=%{kbd}
K=%{buildroot}$KBD
@@ -152,8 +149,6 @@
echo ;
exit 1
fi
-install -m 755 %{SOURCE4} %{buildroot}%{_initddir}/kbd
-ln -s /etc/init.d/kbd %{buildroot}%{_sbindir}/rckbd
ln -sf us.map.gz $K/keymaps/i386/qwerty/khmer.map.gz
ln -sf us.map.gz $K/keymaps/i386/qwerty/korean.map.gz
ln -sf us.map.gz $K/keymaps/i386/qwerty/arabic.map.gz
@@ -272,7 +267,6 @@
ln -s %{_bindir}/unicode_start %{buildroot}/bin
ln -s %{_bindir}/unicode_stop %{buildroot}/bin
ln -s %{_sbindir}/fbtest %{buildroot}/sbin
-ln -s %{_sbindir}/rckbd %{buildroot}/sbin
%ifnarch %sparc m68k
ln -s %{_bindir}/getkeycodes %{buildroot}/bin
ln -s %{_bindir}/setkeycodes %{buildroot}/bin
@@ -287,26 +281,21 @@
%find_lang %{name}
%post
-%{fillup_and_insserv -ny console kbd}
+%{fillup_only -n console}
%{fillup_only -n keyboard}
#echo Please read the docu about the new COMPOSETABLE rc.config variable.
#echo See /etc/sysconfig/console, /etc/sysconfig/keyboard
#echo and {_docdir}/kbd/README.SuSE.
-%postun
-%{insserv_cleanup}
-
%files -f %{name}.lang
%defattr(-,root,root)
#config(noreplace) /etc/sysconfig/console
%doc %{_defaultdocdir}/kbd
#doc COPYING CHANGES README CREDITS
-%config %{_sysconfdir}/init.d/kbd
%{_localstatedir}/adm/fillup-templates/sysconfig.console
%{_localstatedir}/adm/fillup-templates/sysconfig.keyboard
%{kbd}
#UsrMerge
-/sbin/rckbd
/sbin/fbtest
/bin/chvt
/bin/openvt
@@ -353,7 +342,6 @@
/bin/spawn_console
/bin/spawn_login
#EndUsrMerge
-%{_sbindir}/rckbd
%{_sbindir}/fbtest
%{_bindir}/chvt
%{_bindir}/openvt
@@ -399,7 +387,6 @@
%{_bindir}/setvesablank
%{_bindir}/spawn_console
%{_bindir}/spawn_login
-%{_bindir}/vlock
%doc %{_mandir}/man1/*
%doc %{_mandir}/man5/keymaps.5.gz
%ifnarch %sparc m68k
++ sysconfig.keyboard ++
--- /var/tmp/diff_new_pack.Axb3dn/_old 2013-04-05 07:36:37.0 +0200
+++ /var/tmp/diff_new_pack.Axb3dn/_new 2013-04-05 07:36:37.0 +0200
@@ -28,6 +28,7 @@
## Default: bios
#
# NumLock on? (yes or no or empty or bios for BIOS setting)
+# This setting may interfere with GNOME
/desktop/gnome/peripherals/keyboard/remember_numlock_state GConf key.
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2012-12-07 14:17:28
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is kbd, Maintainer is sbra...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2012-05-08 12:27:31.0
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2012-12-07
14:17:30.0 +0100
@@ -1,0 +2,29 @@
+Wed Dec 5 20:45:40 UTC 2012 - dap.darkn...@gmail.com
+
+- Update to version 1.15.5:
+ * Fix msgstr in es.po and update translations.
+ * Update changelog and increase version (1.15.5wip).
+ * po: Update vi.po from translationproject.org.
+ * Fix various vlock build errors.
+ * Fix loadkeys.analyze lex handling.
+ * Ignore config.cache files.
+- Applied into upstream kbd-1.15.3-po-es.patch was deleted.
+
+---
+Mon Dec 3 18:58:13 UTC 2012 - dap.darkn...@gmail.com
+
+- Update to version 1.15.4:
+ * vlock: New utility which locks one or more virtual consoles.
+ * loadkeys: Change the handling of -C option.
+ * loadkeys: Fix -d option.
+ * Add dvorak-es keymap.
+ * Add dvorak-uk keymap (Joe MacMahon).
+ * Add dvorak-sv-a1 and dvorak-sv-a5 keymaps.
+ * Add ruwin_alt_sh-UTF-8 keymap (Dmitriy Perlow).
+- kbd-1.15.3-po-es.patch was fixed.
+- Applied into upstream patches were deleted.
+- Fixed up via spec-cleaner.
+- Clean-section was removed.
+- Macro warnings were fixed via '%' deleting.
+
+---
Old:
kbd-1.15.2-defkeymap.patch
kbd-1.15.3-loadkeys.diff
kbd-1.15.3-po-es.patch
kbd-1.15.3-repack.tar.bz2
kbd-1.15.3-resizecons-enable-x86_64.patch
kbd-1.15.3.tar.bz2
New:
kbd-1.15.5-repack.tar.bz2
kbd-1.15.5.tar.gz
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.HNR4Wg/_old 2012-12-07 14:17:32.0 +0100
+++ /var/tmp/diff_new_pack.HNR4Wg/_new 2012-12-07 14:17:32.0 +0100
@@ -17,18 +17,17 @@
Name: kbd
-# git: git://git.altlinux.org/people/legion/packages/kbd.git
-Url:ftp://ftp.altlinux.org/pub/people/legion/kbd/
-BuildRequires: automake
-Version:1.15.3
+Version:1.15.5
Release:0
Summary:Keyboard and Font Utilities
License:GPL-2.0+
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: kbd-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.gz
%else
-Source: kbd-%{version}-repack.tar.bz2
+Source: %{name}-%{version}-repack.tar.bz2
%endif
Source1:kbd_fonts.tar.bz2
Source2:suse-add.tar.bz2
@@ -51,17 +50,20 @@
Patch4: kbd-1.15.2-sv-latin1-keycode10.patch
Patch5: kbd-1.15.2-setfont-no-cruft.patch
Patch6: kbd-1.15.2-dumpkeys-C-opt.patch
-Patch7: kbd-1.15.2-defkeymap.patch
Patch8: kbd-1.15.2-chvt-userwait.patch
-Patch9: kbd-%{version}-po-es.patch
-Patch10:kbd-1.15.3-loadkeys.diff
-Patch11:kbd-1.15.3-resizecons-enable-x86_64.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-PreReq: %fillup_prereq %insserv_prereq
+
+BuildRequires: automake
BuildRequires: bison
BuildRequires: flex
+BuildRequires: pam-devel
+
+Requires(pre): %fillup_prereq
+Requires(pre): %insserv_prereq
+
Recommends: fbset
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
%description
Load and save keyboard mappings. This is needed if you are not using
the US keyboard map. This package also contains utilities for changing
@@ -88,15 +90,11 @@
%patch4 -p1
%patch5 -p1
%patch6
-%patch7 -p1
%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
%build
for i in `find data/keymaps/mac -type f` ; do
-sed -i -f %{S:42} $i
+sed -i -f %{SOURCE42} $i
done
# workaround ambiguous keymap names
pushd data/keymaps/i386
@@ -110,8 +108,8 @@
--enable-nls \
--localedir=/usr/share/locale \
--enable-optional-progs
-make CFLAGS=$RPM_OPT_FLAGS -Os
-%{__cc} $RPM_OPT_FLAGS -o fbtest $RPM_SOURCE_DIR/fbtest.c
+make CFLAGS=%{optflags} -Os
+gcc %{optflags} -o fbtest $RPM_SOURCE_DIR/fbtest.c
# fix lat2-16.psfu (bnc#340579)
font=data/consolefonts/lat2a-16.psfu
./src/psfxtable -i $font -it data/unimaps/lat2u.uni \
@@ -120,11 +118,11 @@
make
%install
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-DOC=${RPM_BUILD_ROOT}%{_defaultdocdir}/kbd
+mkdir -p %{buildroot}%{_sbindir}
+mkdir -p %{buildroot}%{_sysconfdir}/init.d
+DOC=%{buildroot}%{_defaultdocdir}/kbd
KBD=%{kbd}
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2012-05-08 12:27:28
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new (New)
Package is kbd, Maintainer is sbra...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2011-12-21 14:56:56.0
+0100
+++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2012-05-08
12:27:31.0 +0200
@@ -1,0 +2,5 @@
+Fri Apr 20 15:40:30 UTC 2012 - rschweik...@suse.com
+
+- Place binaries into /usr tree (UsrMerge project)
+
+---
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.8M1xfR/_old 2012-05-08 12:27:33.0 +0200
+++ /var/tmp/diff_new_pack.8M1xfR/_new 2012-05-08 12:27:33.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kbd
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,16 +16,15 @@
#
-
Name: kbd
# git: git://git.altlinux.org/people/legion/packages/kbd.git
Url:ftp://ftp.altlinux.org/pub/people/legion/kbd/
-License:GPL-2.0+
-Group: System/Console
BuildRequires: automake
Version:1.15.3
Release:0
Summary:Keyboard and Font Utilities
+License:GPL-2.0+
+Group: System/Console
%if 0
Source: kbd-%{version}.tar.bz2
%else
@@ -107,10 +106,7 @@
test -f olpc/es-olpc.map || mv olpc/es.map olpc/es-olpc.map
popd
%configure \
- --prefix=/ \
--datadir=%{kbd} \
- --mandir=%{_mandir} \
- --bindir=/bin \
--enable-nls \
--localedir=/usr/share/locale \
--enable-optional-progs
@@ -124,10 +120,7 @@
make
%install
-mkdir -p $RPM_BUILD_ROOT/bin
-mkdir -p $RPM_BUILD_ROOT/sbin
-#mkdir -p $RPM_BUILD_ROOT/usr/bin
-#mkdir -p $RPM_BUILD_ROOT/usr/sbin
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
mkdir -p $RPM_BUILD_ROOT/etc/init.d
DOC=${RPM_BUILD_ROOT}%{_defaultdocdir}/kbd
KBD=%{kbd}
@@ -162,7 +155,7 @@
exit 1
fi
install -m 755 %SOURCE4 $RPM_BUILD_ROOT/etc/init.d/kbd
-ln -sf ../etc/init.d/kbd $RPM_BUILD_ROOT/sbin/rckbd
+ln -s /etc/init.d/kbd $RPM_BUILD_ROOT%{_sbindir}/rckbd
ln -sf us.map.gz $K/keymaps/i386/qwerty/khmer.map.gz
ln -sf us.map.gz $K/keymaps/i386/qwerty/korean.map.gz
ln -sf us.map.gz $K/keymaps/i386/qwerty/arabic.map.gz
@@ -239,10 +232,60 @@
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/getkeycodes.8*
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/setkeycodes.8*
%endif
-install -m 755 %_sourcedir/testutf8 $RPM_BUILD_ROOT/bin/
-install -m 755 fbtest$RPM_BUILD_ROOT/sbin/
+install -m 755 %_sourcedir/testutf8 $RPM_BUILD_ROOT/%{_bindir}
+install -m 755 fbtest$RPM_BUILD_ROOT/%{_sbindir}
install -m 644 %SOURCE12 $RPM_BUILD_ROOT/%{_mandir}/man8/
-install -m 755 %SOURCE13 $RPM_BUILD_ROOT/bin/guess_encoding
+install -m 755 %SOURCE13 $RPM_BUILD_ROOT/%{_bindir}/guess_encoding
+#UsrMerge
+mkdir -p $RPM_BUILD_ROOT/bin
+mkdir -p $RPM_BUILD_ROOT/sbin
+ln -s %{_bindir}/chvt $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/clrunimap $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/deallocvt $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/dumpkeys $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/fgconsole $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/getunimap $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/guess_encoding $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/kbd_mode $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/kbdinfo $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/kbdrate $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/loadkeys $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/loadunimap $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/mapscrn $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/openvt $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/outpsfheader $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/psfaddtable $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/psfgettable $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/psfstriptable $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/psfxtable $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/screendump $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/setfont $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/setleds $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/setlogcons $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/setmetamode $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/setpalette $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/setvesablank $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/setvtrgb $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/showconsolefont $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/showkey $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/spawn_console $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/spawn_login $RPM_BUILD_ROOT/bin
+ln -s
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory
checked in at Mon Oct 10 14:11:11 CEST 2011.
--- openSUSE:Factory/kbd/kbd.changes2011-10-04 18:12:32.0 +0200
+++ /mounts/work_src_done/STABLE/kbd/kbd.changes2011-10-05
15:41:48.0 +0200
@@ -1,0 +2,5 @@
+Wed Oct 5 13:37:08 UTC 2011 - lnus...@suse.de
+
+- fix loadkeys -C option (bnc#720486)
+
+---
calling whatdependson for head-i586
Old:
kbd-1.15.2.tar.bz2
New:
kbd-1.15.3-loadkeys.diff
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.kgDeBk/_old 2011-10-10 14:11:06.0 +0200
+++ /var/tmp/diff_new_pack.kgDeBk/_new 2011-10-10 14:11:06.0 +0200
@@ -19,6 +19,7 @@
Name: kbd
+# git: git://git.altlinux.org/people/legion/packages/kbd.git
Url:ftp://ftp.altlinux.org/pub/people/legion/kbd/
License:GPLv2+
Group: System/Console
@@ -55,6 +56,7 @@
Patch7: kbd-1.15.2-defkeymap.patch
Patch8: kbd-1.15.2-chvt-userwait.patch
Patch9: kbd-%{version}-po-es.patch
+Patch10:kbd-1.15.3-loadkeys.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq %insserv_prereq
BuildRequires: bison flex
@@ -89,6 +91,7 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
for i in `find data/keymaps/mac -type f` ; do
++ kbd-1.15.3-loadkeys.diff ++
Index: kbd-1.15.3/src/loadkeys.y
===
--- kbd-1.15.3.orig/src/loadkeys.y
+++ kbd-1.15.3/src/loadkeys.y
@@ -352,8 +352,6 @@ static int defkeys(int fd, int kbd_mode)
j, (key_map[i])[j]);
}
}
- xfree(key_map[i]);
- xfree(keymap_was_set[i]);
} else if (keymaps_line_seen !defining[i]) {
/* deallocate keymap */
@@ -1116,7 +1114,7 @@ int main(int argc, char *argv[])
if (!optm !optb) {
/* check whether the keyboard is in Unicode mode */
- fd = getfd(console);
+ fd = getfd(NULL);
if (ioctl(fd, KDGKBMODE, kbd_mode)) {
perror(KDGKBMODE);
continue with q...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory
checked in at Tue Oct 4 18:12:30 CEST 2011.
--- openSUSE:Factory/kbd/kbd.changes2011-09-23 02:04:37.0 +0200
+++ /mounts/work_src_done/STABLE/kbd/kbd.changes2011-09-30
17:29:25.0 +0200
@@ -1,0 +2,6 @@
+Fri Sep 30 15:28:41 UTC 2011 - u...@suse.com
+
+- cross-build fix: use %__cc, %configure macros
+- configure: explicitly set bindir
+
+---
calling whatdependson for head-i586
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.YUoW5z/_old 2011-10-04 18:12:24.0 +0200
+++ /var/tmp/diff_new_pack.YUoW5z/_new 2011-10-04 18:12:24.0 +0200
@@ -101,15 +101,16 @@
# bnc#435121
test -f olpc/es-olpc.map || mv olpc/es.map olpc/es-olpc.map
popd
-./configure \
+%configure \
--prefix=/ \
--datadir=%{kbd} \
--mandir=%{_mandir} \
+ --bindir=/bin \
--enable-nls \
--localedir=/usr/share/locale \
--enable-optional-progs
make CFLAGS=$RPM_OPT_FLAGS -Os
-gcc $RPM_OPT_FLAGS -o fbtest $RPM_SOURCE_DIR/fbtest.c
+%{__cc} $RPM_OPT_FLAGS -o fbtest $RPM_SOURCE_DIR/fbtest.c
# fix lat2-16.psfu (bnc#340579)
font=data/consolefonts/lat2a-16.psfu
./src/psfxtable -i $font -it data/unimaps/lat2u.uni \
continue with q...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory
checked in at Thu Sep 15 12:23:12 CEST 2011.
--- kbd/kbd.changes 2011-03-21 14:10:35.0 +0100
+++ /mounts/work_src_done/STABLE/kbd/kbd.changes2011-09-14
16:25:49.0 +0200
@@ -1,0 +2,14 @@
+Wed Sep 14 15:58:43 CEST 2011 - sbra...@suse.cz
+
+- Update to version 1.15.3:
+ * kbdinfo: New utility to obtain information about console.
+ * setvtrgb: New utility to set the virtual terminal RGB colors.
+ * loadkeys: Add LOADKEYS_KEYMAP_PATH env variable.
+ * loadkeys: Fix some memory leaks.
+ * loadkeys: Do not set prefer_unicode for iso-8859-1.
+ * loadkeys -a: Switch to ASCII mode.
+ * loadkeys: Fix compose as usual for Unicode diacritics.
+ * Add dvorak-ru keymap.
+ * Add LatGrkCyr fonts.
+
+---
@@ -17,0 +32 @@
+ (bnc#463801)
calling whatdependson for head-i586
New:
kbd-1.15.3-po-es.patch
kbd-1.15.3-repack.tar.bz2
kbd-1.15.3.tar.bz2
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.E6p76A/_old 2011-09-15 12:23:07.0 +0200
+++ /var/tmp/diff_new_pack.E6p76A/_new 2011-09-15 12:23:07.0 +0200
@@ -23,10 +23,14 @@
License:GPLv2+
Group: System/Console
AutoReqProv:on
-Version:1.15.2
-Release:42
+Version:1.15.3
+Release:1
Summary:Keyboard and Font Utilities
+%if 0
Source: kbd-%{version}.tar.bz2
+%else
+Source: kbd-%{version}-repack.tar.bz2
+%endif
Source1:kbd_fonts.tar.bz2
Source2:suse-add.tar.bz2
Source3:README.SuSE
@@ -41,15 +45,16 @@
Source13: guess_encoding.pl
Source42: convert-kbd-mac.sed
Source43: repack_kbd.sh
-Patch0: kbd-%{version}-prtscr_no_sigquit.patch
-Patch1: kbd-%{version}-dumpkeys-ppc.patch
-Patch2: kbd-%{version}-unicode_scripts.patch
-Patch3: kbd-%{version}-docu-X11R6-xorg.patch
-Patch4: kbd-%{version}-sv-latin1-keycode10.patch
-Patch5: kbd-%{version}-setfont-no-cruft.patch
-Patch6: kbd-%{version}-dumpkeys-C-opt.patch
-Patch7: kbd-%{version}-defkeymap.patch
-Patch8: kbd-%{version}-chvt-userwait.patch
+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
+Patch6: kbd-1.15.2-dumpkeys-C-opt.patch
+Patch7: kbd-1.15.2-defkeymap.patch
+Patch8: kbd-1.15.2-chvt-userwait.patch
+Patch9: kbd-%{version}-po-es.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq %insserv_prereq
BuildRequires: bison flex
@@ -83,6 +88,7 @@
%patch6
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%build
for i in `find data/keymaps/mac -type f` ; do
@@ -262,6 +268,7 @@
%endif
/bin/fgconsole
/bin/kbd_mode
+/bin/kbdinfo
/bin/loadkeys
/bin/loadunimap
/bin/mapscrn
@@ -275,6 +282,7 @@
/bin/setfont
/bin/setleds
/bin/setmetamode
+/bin/setvtrgb
/bin/showconsolefont
/bin/showkey
/bin/unicode_start
@@ -311,6 +319,7 @@
%doc %{_mandir}/man8/mk_modmap.8.gz
%doc %{_mandir}/man8/setlogcons.8.gz
%doc %{_mandir}/man8/setvesablank.8.gz
+%doc %{_mandir}/man8/setvtrgb.8.gz
%doc %{_mandir}/man8/vcstime.8.gz
%clean
++ kbd-1.15.3-po-es.patch ++
Index: kbd-1.15.3/po/es.po
===
--- kbd-1.15.3.orig/po/es.po
+++ kbd-1.15.3/po/es.po
@@ -1361,7 +1361,6 @@ msgid Found nothing to save\n
msgstr No se encontró nada que guardar\n
#: src/setfont.c:682
-#, c-format
msgid Saved %d-char %dx%d font file on %s\n
msgstr Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en
%s\n
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kbd for openSUSE:Factory
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory
checked in at Mon Mar 21 15:15:56 CET 2011.
--- kbd/kbd.changes 2011-02-17 12:47:47.0 +0100
+++ /mounts/work_src_done/STABLE/kbd/kbd.changes2011-03-21
14:10:35.0 +0100
@@ -1,0 +2,7 @@
+Mon Mar 21 14:07:36 CET 2011 - wer...@suse.de
+
+- If /usr is located in a separate partition, the locale command fails.
+- Ignore /var/run/keymap in sinlge user mode otherwise key mapping
+ could be wrong if booted cold into sinlge user mode
+
+---
calling whatdependson for head-i586
Other differences:
--
++ kbd.spec ++
--- /var/tmp/diff_new_pack.eSF5OK/_old 2011-03-21 15:15:18.0 +0100
+++ /var/tmp/diff_new_pack.eSF5OK/_new 2011-03-21 15:15:18.0 +0100
@@ -24,7 +24,7 @@
Group: System/Console
AutoReqProv:on
Version:1.15.2
-Release:41
+Release:42
Summary:Keyboard and Font Utilities
Source: kbd-%{version}.tar.bz2
Source1:kbd_fonts.tar.bz2
++ kbd.init ++
--- /var/tmp/diff_new_pack.eSF5OK/_old 2011-03-21 15:15:18.0 +0100
+++ /var/tmp/diff_new_pack.eSF5OK/_new 2011-03-21 15:15:18.0 +0100
@@ -41,7 +41,7 @@
# XXX: is this really needed just for LOCALE_CHARMAP?
test -e /etc/SuSEconfig/profile . /etc/SuSEconfig/profile
test -e /etc/profile.d/lang.sh . /etc/profile.d/lang.sh
-LOCALE_CHARMAP=`locale charmap`
+LOCALE_CHARMAP=`locale charmap 2/dev/null`
LC_ALL=POSIX
KBDBASE=/usr/share/kbd
@@ -164,7 +164,7 @@
# this means that initialization was already done.
# don't do it twice unless forced, it may annoy xdm and
# produce lots of error messages.
- test -s /var/run/keymap exit 0
+ test -s /var/run/keymap -a $RUNLEVEL != S exit 0
;;
esac
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
