diff --git a/kbd-1.15.5-loadkeys-search-path.patch b/kbd-1.15.5-loadkeys-search-path.patch index e5f0535e19dc7faef81e3e38285e21ea36f8d66f..8f4a98eb2d8864ab13918421c037650e72235e04 100644 --- a/kbd-1.15.5-loadkeys-search-path.patch +++ b/kbd-1.15.5-loadkeys-search-path.patch @@ -1,24 +1,18 @@ -diff -Nur kbd-2.4.0/src/loadkeys.c kbd-2.4.0-new/src/loadkeys.c ---- kbd-2.4.0/src/loadkeys.c 2020-06-02 18:16:45.000000000 +0800 -+++ kbd-2.4.0-new/src/loadkeys.c 2021-12-07 16:02:44.873000000 +0800 -@@ -27,9 +27,11 @@ +diff -up kbd-2.6.2/src/loadkeys.c.orig kbd-2.6.2/src/loadkeys.c +--- kbd-2.6.2/src/loadkeys.c.orig 2023-08-22 10:02:52.261785310 +0200 ++++ kbd-2.6.2/src/loadkeys.c 2023-08-22 10:03:44.351889761 +0200 +@@ -27,6 +27,8 @@ static const char *const dirpath1[] = { - "", -- DATADIR "/" KEYMAPDIR "/**", -- KERNDIR "/", -- NULL -+ DATADIR "/" KEYMAPDIR "/**", -+ DATADIR "/" XKBKEYMAPDIR "/", -+ DATADIR "/" LEGACYKEYMAPDIR "/**", -+ KERNDIR "/", -+ 0 + DATADIR "/" KEYMAPDIR "/**", ++ DATADIR "/" XKBKEYMAPDIR "/", ++ DATADIR "/" LEGACYKEYMAPDIR "/**", + KERNDIR "/", + NULL }; - static const char *const suffixes[] = { - "", -diff -Nur kbd-2.4.0/src/paths.h kbd-2.4.0-new/src/paths.h ---- kbd-2.4.0/src/paths.h 2020-04-27 23:53:01.000000000 +0800 -+++ kbd-2.4.0-new/src/paths.h 2021-12-07 16:03:15.780000000 +0800 +diff -up kbd-2.6.2/src/paths.h.orig kbd-2.6.2/src/paths.h +--- kbd-2.6.2/src/paths.h.orig 2023-08-22 10:04:03.021927193 +0200 ++++ kbd-2.6.2/src/paths.h 2023-08-22 10:04:35.740992805 +0200 @@ -5,6 +5,8 @@ * The following five subdirectories are defined: */ diff --git a/kbd-2.6.1.tar.xz b/kbd-2.6.1.tar.xz deleted file mode 100644 index 51ac3f2b844be894561962afe9ea476651a9532c..0000000000000000000000000000000000000000 Binary files a/kbd-2.6.1.tar.xz and /dev/null differ diff --git a/kbd-2.6.4.tar.xz b/kbd-2.6.4.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..e8e91111a235ffd2641f4f16237ed18f123825b7 Binary files /dev/null and b/kbd-2.6.4.tar.xz differ diff --git a/kbd.spec b/kbd.spec index 00fe918e71341beded56b45e79ce3ecaa79763bd..9ee618eb3afb77e31d3d2caab0555607f1117ce7 100644 --- a/kbd.spec +++ b/kbd.spec @@ -1,7 +1,7 @@ %global kbd_datadir %{_exec_prefix}/lib/kbd Name: kbd -Version: 2.6.1 +Version: 2.6.4 Release: 1 Summary: Tools for managing Linux console(keyboard, virtual terminals, etc.) License: GPLv2+ @@ -57,13 +57,7 @@ But %{name}-legacy can do nothing without %{name}. %setup -q -a 1 -a 2 cp -fp %{SOURCE3} . cp -fp %{SOURCE6} . -%patch0 -p1 -b .keycodes-man -%patch1 -p1 -b .sparc -%patch2 -p1 -b .unicode_start -%patch3 -p1 -b .sg-decimal-separator -%patch4 -p1 -b .loadkeys-search-path -%patch5 -p1 -b .unicode-start-font -%patch6 -p1 -b .covscan-fixes.patch +%autopatch -p1 aclocal autoconf @@ -170,6 +164,9 @@ make check %{_mandir}/man8/*.8.gz %changelog +* Tue Jan 02 2024 konglidong - 2.6.4-1 +- update version to 2.6.4 + * Wed Jul 19 2023 zhouwenpei - 2.6.1-1 - update to 2.6.1