Update to latest upstream version

This commit is contained in:
Vitezslav Crhonek 2023-01-05 14:51:41 +01:00
parent 6daf72db99
commit 3a812d6c9a
4 changed files with 16 additions and 12 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/console-setup_1.212.tar.xz /console-setup_1.215.tar.xz

View File

@ -1,7 +1,7 @@
diff -up console-setup-1.212/Keyboard/ckbcomp.orig console-setup-1.212/Keyboard/ckbcomp diff -up console-setup/Keyboard/ckbcomp.orig console-setup/Keyboard/ckbcomp
--- console-setup-1.212/Keyboard/ckbcomp.orig 2022-12-15 15:03:22.255192584 +0100 --- console-setup/Keyboard/ckbcomp.orig 2023-01-05 09:43:41.059205282 +0100
+++ console-setup-1.212/Keyboard/ckbcomp 2022-12-15 15:05:10.359083229 +0100 +++ console-setup/Keyboard/ckbcomp 2023-01-05 09:44:49.789082563 +0100
@@ -196,10 +196,6 @@ my %acmtable; # Unicode -> legacy code ( @@ -204,10 +204,6 @@ my %acmtable; # Unicode -> legacy code (
my $KEYMAP = ''; # This variable contains the generated keymap my $KEYMAP = ''; # This variable contains the generated keymap
@ -12,7 +12,7 @@ diff -up console-setup-1.212/Keyboard/ckbcomp.orig console-setup-1.212/Keyboard/
my %keycodes_table; # x keysym -> x key code my %keycodes_table; # x keysym -> x key code
my %aliases; # x keysym -> x keysym my %aliases; # x keysym -> x keysym
@@ -4376,9 +4372,6 @@ sub print_vector { @@ -4400,9 +4396,6 @@ sub print_vector {
my $u = ord (uc (pack ("U", $v))); my $u = ord (uc (pack ("U", $v)));
my $c = ($v == $l ? $u : $l); my $c = ($v == $l ? $u : $l);
$capsvector[$mask] = $1 ."U+". sprintf ("%04x", $c); $capsvector[$mask] = $1 ."U+". sprintf ("%04x", $c);
@ -22,7 +22,7 @@ diff -up console-setup-1.212/Keyboard/ckbcomp.orig console-setup-1.212/Keyboard/
} }
} }
if ($no_NoSymbol) { if ($no_NoSymbol) {
@@ -4776,10 +4769,6 @@ keycode 127 = @@ -4800,10 +4793,6 @@ keycode 127 =
die "$0: Unsupported keyboard type $arch\n"; die "$0: Unsupported keyboard type $arch\n";
} }
@ -32,4 +32,4 @@ diff -up console-setup-1.212/Keyboard/ckbcomp.orig console-setup-1.212/Keyboard/
- -
print $KEYMAP; print $KEYMAP;
if ($freebsd) { if (!$compose_charmap && $charmap) {

View File

@ -1,6 +1,6 @@
Name: console-setup Name: console-setup
Version: 1.212 Version: 1.215
Release: 1%{?dist} Release: 1%{?dist}
Summary: Tools for configuring the console using X Window System key maps Summary: Tools for configuring the console using X Window System key maps
@ -20,7 +20,7 @@ Requires: kbd
# require 'xkeyboard-config' to have X Window keyboard descriptions? # require 'xkeyboard-config' to have X Window keyboard descriptions?
BuildRequires: perl-generators BuildRequires: perl-generators
BuildRequires: perl(encoding) BuildRequires: perl(encoding) perl(open)
BuildRequires: make BuildRequires: make
BuildArch: noarch BuildArch: noarch
@ -46,7 +46,7 @@ not wasted but used for another symbol.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}
%patch0 -p1 -b .paths %patch0 -p1 -b .paths
%patch1 -p1 -b .fsf-address %patch1 -p1 -b .fsf-address
%patch2 -p1 -b .ctrll-lock %patch2 -p1 -b .ctrll-lock
@ -96,6 +96,10 @@ cp -a Fonts/fontsets Fonts/*.equivalents Fonts/*.set \
%changelog %changelog
* Thu Jan 05 2023 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.215-1
- Update to latest upstream version
Resolves: #2156436
* Fri Dec 16 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.212-1 * Fri Dec 16 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.212-1
- Update to latest upstream version - Update to latest upstream version
Resolves: #2152910 Resolves: #2152910

View File

@ -1 +1 @@
SHA512 (console-setup_1.212.tar.xz) = 1b94acc7a53869c18ea8c5898c71eb7a12858a73a3158f5a559d779c126bce737e54ec73d89fb04cd685eca2b65abc12f024ce7bc54129717c45faeed58d3238 SHA512 (console-setup_1.215.tar.xz) = 8a137d49316f4a33c2cb7799b51acc5da072382efd13e0170858042cb341a1d5a182dc962e296d580c918906ea356aee3e2675497e041bda3ade5fbe6c482b96