diff --git a/kbd-1.15.5-loadkeys-search-path.patch b/kbd-1.15.5-loadkeys-search-path.patch new file mode 100644 index 0000000..a9b167e --- /dev/null +++ b/kbd-1.15.5-loadkeys-search-path.patch @@ -0,0 +1,24 @@ +diff -up kbd-2.0.1/src/loadkeys.c.orig kbd-2.0.1/src/loadkeys.c +--- kbd-2.0.1/src/loadkeys.c.orig 2013-11-27 12:56:57.846069007 +0100 ++++ kbd-2.0.1/src/loadkeys.c 2013-11-27 12:58:03.877302345 +0100 +@@ -26,7 +26,7 @@ + #include "keymap.h" + + static const char *progname = NULL; +-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 suffixes[] = { "", ".kmap", ".map", 0 }; + + static void __attribute__ ((noreturn)) +diff -up kbd-2.0.1/src/paths.h.orig kbd-2.0.1/src/paths.h +--- kbd-2.0.1/src/paths.h.orig 2013-11-27 12:58:10.662326108 +0100 ++++ kbd-2.0.1/src/paths.h 2013-11-27 12:58:32.566403015 +0100 +@@ -5,6 +5,8 @@ + * The following five subdirectories are defined: + */ + #define KEYMAPDIR "keymaps" ++#define XKBKEYMAPDIR "keymaps/xkb" ++#define LEGACYKEYMAPDIR "keymaps/legacy" + #define UNIMAPDIR "unimaps" + #define TRANSDIR "consoletrans" + #define VIDEOMODEDIR "videomodes" diff --git a/kbd.spec b/kbd.spec index 6740fcc..657f08b 100644 --- a/kbd.spec +++ b/kbd.spec @@ -1,6 +1,6 @@ Name: kbd Version: 2.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tools for configuring the console (keyboard, virtual terminals, etc.) Group: System Environment/Base @@ -23,6 +23,8 @@ Patch3: kbd-1.15.3-dumpkeys-man.patch Patch4: kbd-1.15.5-sg-decimal-separator.patch # Patch5: implement PAM account and password management, backported from upstream Patch5: kbd-1.15.5-vlock-more-pam.patch +# Patch6: adds xkb and legacy keymaps subdirs to loadkyes search path, bz 1028207 +Patch6: kbd-1.15.5-loadkeys-search-path.patch BuildRequires: bison, flex, gettext, pam-devel, check-devel BuildRequires: console-setup, xkeyboard-config @@ -64,6 +66,7 @@ cp -fp %{SOURCE3} . %patch3 -p1 -b .dumpkeys-man %patch4 -p1 -b .sg-decimal-separator %patch5 -p1 -b .vlock-more-pam +%patch6 -p1 -b .loadkeys-search-path # 7-bit maps are obsolete; so are non-euro maps pushd data/keymaps/i386 @@ -172,6 +175,9 @@ zgrep -L "U+0041" $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/* | xargs rm -f /lib/kbd/keymaps/legacy %changelog +* Wed Nov 27 2013 Vitezslav Crhonek - 2.0.1-5 +- Add missing patch for loadkeys search path + * Tue Nov 26 2013 Vitezslav Crhonek - 2.0.1-4 - Add xkb and legacy keymaps subdirs to loadkyes search path, remove symlinks Related: #1028207