Update to kbd-2.5.1

This commit is contained in:
Vitezslav Crhonek 2022-06-21 10:36:03 +02:00
parent bb8392f7ea
commit 45b6b9f2cf
4 changed files with 7 additions and 17 deletions

2
.gitignore vendored
View File

@ -9,4 +9,4 @@ terminus.tar.bz2
/fr-dvorak.tar.bz2
/kbd-latarcyrheb-32.tar.bz2
/kbdinfo.1
/kbd-2.5.0.tar.xz
/kbd-2.5.1.tar.xz

View File

@ -1,11 +0,0 @@
diff -up kbd-2.5-rc1/tests/libkeymap.at.orig kbd-2.5-rc1/tests/libkeymap.at
--- kbd-2.5-rc1/tests/libkeymap.at.orig 2022-03-23 09:30:53.176271763 +0100
+++ kbd-2.5-rc1/tests/libkeymap.at 2022-03-23 09:31:13.997291060 +0100
@@ -173,6 +173,6 @@ AT_SKIP_IF([ test "$(arch)" != "x86_64"
cp -f -- \
"$abs_srcdir/data/bkeymap-2.0.4/cz.map.bin" \
expout
-AT_CHECK([$abs_top_builddir/src/loadkeys -b "$abs_top_srcdir/data/keymaps/i386/qwerty/cz.map"],
+AT_CHECK([$abs_top_builddir/src/loadkeys -b "$abs_top_srcdir/data/keymaps/i386/qwerty/cz-qwerty.map"],
[0], [expout])
AT_CLEANUP

View File

@ -4,7 +4,7 @@
%global kbd_datadir %{_exec_prefix}/lib/kbd
Name: kbd
Version: 2.5.0
Version: 2.5.1
Release: 1%{?dist}
Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
License: GPLv2+
@ -32,8 +32,6 @@ Patch4: kbd-1.15.5-loadkeys-search-path.patch
Patch5: kbd-2.0.2-unicode-start-font.patch
# Patch6: fixes issues found by static analysis
Patch6: kbd-2.4.0-covscan-fixes.patch
# Patch7: test uses cz.map that was previously renamed to cz-qwerty.map during the build
Patch7: kbd-2.5.0-renamed-keymap-in-test.patch
BuildRequires: gcc, bison, flex, gettext, pam-devel, check-devel, automake
BuildRequires: console-setup, xkeyboard-config
@ -77,7 +75,6 @@ cp -fp %{SOURCE6} .
%patch4 -p1 -b .loadkeys-search-path
%patch5 -p1 -b .unicode-start-font
%patch6 -p1 -b .covscan-fixes
%patch7 -p1 -b .renamed-keymap-in-test
aclocal
autoconf
@ -191,6 +188,10 @@ make check
%{kbd_datadir}/keymaps/legacy
%changelog
* Tue Jun 21 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.5.1-1
- Update to kbd-2.5.1
Resolves: #2097840
* Wed Jun 08 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.5.0-1
- Update to kbd-2.5.0
Resolves: #2092957

View File

@ -1,4 +1,4 @@
SHA512 (kbd-latsun-fonts.tar.bz2) = b98da5df85017ef1bd297eb2255046d54dd805c84356db7533f24e49fb78c8e3999901a45a49cdf6a74c0002bba2e0aa8327469d78dd38b6e747103972c30584
SHA512 (kbd-latarcyrheb-32.tar.bz2) = 1870a708e16cf16f8343f02f7e97940e8404655078f92709a0b8a334be772faa99b4dbaca37e8d8c5b16d0d4d811fe6b102e4f76ae821148eb33075613dc95b8
SHA512 (kbdinfo.1) = 8696d55f6c15f0ee2c2936eca6180b18100a87b11f0efe809a9531bb1228c67cd096cbc8fa25d9ee496daab28892ee5f320cc4bc9c9d816ff666bb4f80271c99
SHA512 (kbd-2.5.0.tar.xz) = 740c4c7b8a2729f5d0539399f691d4201dab97c6eec554b82cc8c80935e956072e9735a739f8f4febc9849c1e8d9d195318b1d0d4e10dce4d34b5fb6d84111d7
SHA512 (kbd-2.5.1.tar.xz) = 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0