From 6daf72db99fa8cf7e8d98d6a585a3cafee9496eb Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Fri, 16 Dec 2022 12:25:43 +0100 Subject: [PATCH] Update to latest upstream version Signed-off-by: Vitezslav Crhonek --- .gitignore | 2 +- console-setup-1.84-ctrll-lock.patch | 8 ++++---- console-setup.spec | 8 ++++++-- sources | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 3e56ccc..5197a57 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/console-setup_1.211.tar.xz +/console-setup_1.212.tar.xz diff --git a/console-setup-1.84-ctrll-lock.patch b/console-setup-1.84-ctrll-lock.patch index 34155f4..4b56416 100644 --- a/console-setup-1.84-ctrll-lock.patch +++ b/console-setup-1.84-ctrll-lock.patch @@ -1,6 +1,6 @@ -diff -up console-setup-1.201/Keyboard/ckbcomp.orig console-setup-1.201/Keyboard/ckbcomp ---- console-setup-1.201/Keyboard/ckbcomp.orig 2021-03-10 09:35:05.639847205 +0100 -+++ console-setup-1.201/Keyboard/ckbcomp 2021-03-10 09:35:05.641847229 +0100 +diff -up console-setup-1.212/Keyboard/ckbcomp.orig console-setup-1.212/Keyboard/ckbcomp +--- console-setup-1.212/Keyboard/ckbcomp.orig 2022-12-15 15:03:22.255192584 +0100 ++++ console-setup-1.212/Keyboard/ckbcomp 2022-12-15 15:05:10.359083229 +0100 @@ -196,10 +196,6 @@ my %acmtable; # Unicode -> legacy code ( my $KEYMAP = ''; # This variable contains the generated keymap @@ -16,7 +16,7 @@ diff -up console-setup-1.201/Keyboard/ckbcomp.orig console-setup-1.201/Keyboard/ my $u = ord (uc (pack ("U", $v))); my $c = ($v == $l ? $u : $l); $capsvector[$mask] = $1 ."U+". sprintf ("%04x", $c); -- if ($v != $c && $v gt 0x7f) { +- if ($v != $c && $v > 0x7f) { - $broken_caps = 1; - } } diff --git a/console-setup.spec b/console-setup.spec index 8f8634b..c637281 100644 --- a/console-setup.spec +++ b/console-setup.spec @@ -1,6 +1,6 @@ Name: console-setup -Version: 1.211 +Version: 1.212 Release: 1%{?dist} Summary: Tools for configuring the console using X Window System key maps @@ -46,7 +46,7 @@ not wasted but used for another symbol. %prep -%setup -q -n %{name} +%setup -q -n %{name}-%{version} %patch0 -p1 -b .paths %patch1 -p1 -b .fsf-address %patch2 -p1 -b .ctrll-lock @@ -96,6 +96,10 @@ cp -a Fonts/fontsets Fonts/*.equivalents Fonts/*.set \ %changelog +* Fri Dec 16 2022 Vitezslav Crhonek - 1.212-1 +- Update to latest upstream version + Resolves: #2152910 + * Wed Oct 19 2022 Vitezslav Crhonek - 1.211-1 - Update to latest upstream version Resolves: #2135993 diff --git a/sources b/sources index b0132b8..7504b6b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (console-setup_1.211.tar.xz) = a5dbd7b6d68b949bf4aeed188454f74b90c7e2ec1aa8e5a8e843b9ccec082152bb9498c055afc463449ee1ae499cac63510edb4e807fc984cd34075d6f4ba691 +SHA512 (console-setup_1.212.tar.xz) = 1b94acc7a53869c18ea8c5898c71eb7a12858a73a3158f5a559d779c126bce737e54ec73d89fb04cd685eca2b65abc12f024ce7bc54129717c45faeed58d3238