已开启
update version to 2.6.4 #48
AtomGit-Bot创建于 2024年1月2日
update version to 2.6.4 #48
已开启
从refs/pull/48/head合入到master
共 4 个文件变更+17-26
| @@ -1,24 +1,18 @@ | |||
| 1 | -diff -Nur kbd-2.4.0/src/loadkeys.c kbd-2.4.0-new/src/loadkeys.c | 1 | +diff -up kbd-2.6.2/src/loadkeys.c.orig kbd-2.6.2/src/loadkeys.c |
| 2 | ---- kbd-2.4.0/src/loadkeys.c 2020-06-02 18:16:45.000000000 +0800 | 2 | +--- kbd-2.6.2/src/loadkeys.c.orig 2023-08-22 10:02:52.261785310 +0200 |
| 3 | -+++ kbd-2.4.0-new/src/loadkeys.c 2021-12-07 16:02:44.873000000 +0800 | 3 | ++++ kbd-2.6.2/src/loadkeys.c 2023-08-22 10:03:44.351889761 +0200 |
| 4 | -@@ -27,9 +27,11 @@ | 4 | +@@ -27,6 +27,8 @@ |
| 5 | 5 | ||
| 6 | static const char *const dirpath1[] = { | 6 | static const char *const dirpath1[] = { |
| 7 | - "", | 7 | + DATADIR "/" KEYMAPDIR "/**", |
| 8 | -- DATADIR "/" KEYMAPDIR "/**", | 8 | ++ DATADIR "/" XKBKEYMAPDIR "/", |
| 9 | -- KERNDIR "/", | 9 | ++ DATADIR "/" LEGACYKEYMAPDIR "/**", |
| 10 | -- NULL | 10 | + KERNDIR "/", |
| 11 | -+ DATADIR "/" KEYMAPDIR "/**", | 11 | + NULL |
| 12 | -+ DATADIR "/" XKBKEYMAPDIR "/", | ||
| 13 | -+ DATADIR "/" LEGACYKEYMAPDIR "/**", | ||
| 14 | -+ KERNDIR "/", | ||
| 15 | -+ 0 | ||
| 16 | }; | 12 | }; |
| 17 | - static const char *const suffixes[] = { | 13 | +diff -up kbd-2.6.2/src/paths.h.orig kbd-2.6.2/src/paths.h |
| 18 | - "", | 14 | +--- kbd-2.6.2/src/paths.h.orig 2023-08-22 10:04:03.021927193 +0200 |
| 19 | -diff -Nur kbd-2.4.0/src/paths.h kbd-2.4.0-new/src/paths.h | 15 | ++++ kbd-2.6.2/src/paths.h 2023-08-22 10:04:35.740992805 +0200 |
| 20 | ---- kbd-2.4.0/src/paths.h 2020-04-27 23:53:01.000000000 +0800 | ||
| 21 | -+++ kbd-2.4.0-new/src/paths.h 2021-12-07 16:03:15.780000000 +0800 | ||
| 22 | 16 | ||
| 23 | * The following five subdirectories are defined: | 17 | * The following five subdirectories are defined: |
| 24 | */ | 18 | */ |
Binary files do not support preview
| @@ -1,7 +1,7 @@ | |||
| 1 | %global kbd_datadir %{_exec_prefix}/lib/kbd | 1 | %global kbd_datadir %{_exec_prefix}/lib/kbd |
| 2 | 2 | ||
| 3 | Name: kbd | 3 | Name: kbd |
| 4 | -Version: 2.6.1 | 4 | +Version: 2.6.4 |
| 5 | Release: 1 | 5 | Release: 1 |
| 6 | Summary: Tools for managing Linux console(keyboard, virtual terminals, etc.) | 6 | Summary: Tools for managing Linux console(keyboard, virtual terminals, etc.) |
| 7 | License: GPLv2+ | 7 | License: GPLv2+ |
| @@ -57,13 +57,7 @@ But %{name}-legacy can do nothing without %{name}. | |||
| 57 | %setup -q -a 1 -a 2 | 57 | %setup -q -a 1 -a 2 |
| 58 | cp -fp %{SOURCE3} . | 58 | cp -fp %{SOURCE3} . |
| 59 | cp -fp %{SOURCE6} . | 59 | cp -fp %{SOURCE6} . |
| 60 | -%patch0 -p1 -b .keycodes-man | 60 | +%autopatch -p1 |
| 61 | -%patch1 -p1 -b .sparc | ||
| 62 | -%patch2 -p1 -b .unicode_start | ||
| 63 | -%patch3 -p1 -b .sg-decimal-separator | ||
| 64 | -%patch4 -p1 -b .loadkeys-search-path | ||
| 65 | -%patch5 -p1 -b .unicode-start-font | ||
| 66 | -%patch6 -p1 -b .covscan-fixes.patch | ||
| 67 | aclocal | 61 | aclocal |
| 68 | autoconf | 62 | autoconf |
| 69 | 63 | ||
| @@ -170,6 +164,9 @@ make check | |||
| 170 | %{_mandir}/man8/*.8.gz | 164 | %{_mandir}/man8/*.8.gz |
| 171 | 165 | ||
| 172 | %changelog | 166 | %changelog |
| 167 | +* Tue Jan 02 2024 konglidong <konglidong@uniontech.com> - 2.6.4-1 | ||
| 168 | +- update version to 2.6.4 | ||
| 169 | + | ||
| 173 | * Wed Jul 19 2023 zhouwenpei <zhouwenpei@h-partners.com> - 2.6.1-1 | 170 | * Wed Jul 19 2023 zhouwenpei <zhouwenpei@h-partners.com> - 2.6.1-1 |
| 174 | - update to 2.6.1 | 171 | - update to 2.6.1 |
| 175 | 172 | ||