From 4f2fd4903175e832f3b2134c975747e8f4dbad5c Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Wed, 10 Mar 2021 10:28:27 +0100 Subject: [PATCH] Update to latest upstream version --- .gitignore | 2 +- console-setup-1.84-ctrll-lock.patch | 10 +++++----- console-setup.spec | 8 ++++++-- sources | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 06d20a4..f282c5b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/console-setup_1.200.tar.xz +/console-setup_1.201.tar.xz diff --git a/console-setup-1.84-ctrll-lock.patch b/console-setup-1.84-ctrll-lock.patch index 09fe49e..34155f4 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.185/Keyboard/ckbcomp.orig console-setup-1.185/Keyboard/ckbcomp ---- console-setup-1.185/Keyboard/ckbcomp.orig 2018-08-27 10:45:20.753504386 +0200 -+++ console-setup-1.185/Keyboard/ckbcomp 2018-08-27 10:45:20.758504393 +0200 +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 @@ -196,10 +196,6 @@ my %acmtable; # Unicode -> legacy code ( my $KEYMAP = ''; # This variable contains the generated keymap @@ -12,7 +12,7 @@ diff -up console-setup-1.185/Keyboard/ckbcomp.orig console-setup-1.185/Keyboard/ my %keycodes_table; # x keysym -> x key code my %aliases; # x keysym -> x keysym -@@ -4378,9 +4374,6 @@ sub print_vector { +@@ -4376,9 +4372,6 @@ sub print_vector { my $u = ord (uc (pack ("U", $v))); my $c = ($v == $l ? $u : $l); $capsvector[$mask] = $1 ."U+". sprintf ("%04x", $c); @@ -22,7 +22,7 @@ diff -up console-setup-1.185/Keyboard/ckbcomp.orig console-setup-1.185/Keyboard/ } } if ($no_NoSymbol) { -@@ -4778,10 +4771,6 @@ keycode 127 = +@@ -4776,10 +4769,6 @@ keycode 127 = die "$0: Unsupported keyboard type $arch\n"; } diff --git a/console-setup.spec b/console-setup.spec index 1735257..12155f9 100644 --- a/console-setup.spec +++ b/console-setup.spec @@ -1,7 +1,7 @@ Name: console-setup -Version: 1.200 -Release: 2%{?dist} +Version: 1.201 +Release: 1%{?dist} Summary: Tools for configuring the console using X Window System key maps # For a breakdown of the licensing, see COPYRIGHT, copyright, copyright.fonts and copyright.xkb @@ -94,6 +94,10 @@ cp -a Fonts/fontsets Fonts/*.equivalents Fonts/*.set \ %changelog +* Wed Mar 10 2021 Vitezslav Crhonek - 1.201-1 +- Update to latest upstream version + Resolves: #1930510 + * Tue Jan 26 2021 Fedora Release Engineering - 1.200-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 2b1d3b1..e317935 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (console-setup_1.200.tar.xz) = 6cdf12b89a98df9a7982c07150deaf4085ce52ca7c577c258a0714a05d72e12d9c283b67da9d5b0ac729638c3f142b6acd4ae910a1500501d42a029e15ea3698 +SHA512 (console-setup_1.201.tar.xz) = d303c1ac2a4d8afd430c3ee1c42f5c47fcafc52de93b0243276a32f2b8196a5356e0b82e1aa93dbc0f195ad6132a40058df3c6bd4c4d95564b5be5bdc84908bf