diff --git a/.console-setup.metadata b/.console-setup.metadata index 6d8116e..7fed3f3 100644 --- a/.console-setup.metadata +++ b/.console-setup.metadata @@ -1 +1 @@ -b2aa304c5f5956f81876a765c7b1aa1de251863c SOURCES/console-setup_1.200.tar.xz +e04b040584dcb1e545a8259b676742b3d7ba8738 SOURCES/console-setup_1.224.tar.xz diff --git a/.gitignore b/.gitignore index efe2eb3..4a1d330 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/console-setup_1.200.tar.xz +SOURCES/console-setup_1.224.tar.xz diff --git a/SOURCES/console-setup-1.76-paths.patch b/SOURCES/console-setup-1.76-paths.patch index d437638..bc53b20 100644 --- a/SOURCES/console-setup-1.76-paths.patch +++ b/SOURCES/console-setup-1.76-paths.patch @@ -1,12 +1,12 @@ -diff -up console-setup-1.143/Makefile.orig console-setup-1.143/Makefile ---- console-setup-1.143/Makefile.orig 2016-05-24 09:43:13.424382839 +0200 -+++ console-setup-1.143/Makefile 2016-05-24 09:45:10.350994606 +0200 +diff -up console-setup-1.207/Makefile.orig console-setup-1.207/Makefile +--- console-setup-1.207/Makefile.orig 2021-11-08 09:46:06.508441480 +0100 ++++ console-setup-1.207/Makefile 2021-11-08 09:48:57.683728853 +0100 @@ -14,7 +14,7 @@ prefix := /usr/local # etcdir must be either /etc or etcdir := $(prefix)/etc bootprefix := $(patsubst %/usr,%/,$(prefix:%/=%)) -mandir := $(prefix)/share/man -+mandir = $(prefix)/usr/share/man ++mandir := $(prefix)/usr/share/man acmfiles := $(wildcard $./acm/*.acm) @@ -47,9 +47,9 @@ diff -up console-setup-1.143/Makefile.orig console-setup-1.143/Makefile install -d $(mandir)/man1/ install -m 644 man/ckbcomp.1 $(mandir)/man1/ -diff -up console-setup-1.143/man/ckbcomp.1.orig console-setup-1.143/man/ckbcomp.1 ---- console-setup-1.143/man/ckbcomp.1.orig 2011-04-06 03:01:33.000000000 +0200 -+++ console-setup-1.143/man/ckbcomp.1 2016-05-24 09:47:15.360674275 +0200 +diff -up console-setup-1.207/man/ckbcomp.1.orig console-setup-1.207/man/ckbcomp.1 +--- console-setup-1.207/man/ckbcomp.1.orig 2011-07-03 19:59:48.000000000 +0200 ++++ console-setup-1.207/man/ckbcomp.1 2021-11-08 09:51:49.271263086 +0100 @@ -46,7 +46,7 @@ Print a usage message and exit. .BI -charmap\ charmap The encoding to use for the output keymap. There should be an @@ -83,9 +83,9 @@ diff -up console-setup-1.143/man/ckbcomp.1.orig console-setup-1.143/man/ckbcomp. .br .I /usr/share/X11/xkb .br -diff -up console-setup-1.143/man/console-setup.5.orig console-setup-1.143/man/console-setup.5 ---- console-setup-1.143/man/console-setup.5.orig 2016-05-19 05:01:09.000000000 +0200 -+++ console-setup-1.143/man/console-setup.5 2016-05-24 09:47:15.361674281 +0200 +diff -up console-setup-1.207/man/console-setup.5.orig console-setup-1.207/man/console-setup.5 +--- console-setup-1.207/man/console-setup.5.orig 2019-05-30 00:09:36.000000000 +0200 ++++ console-setup-1.207/man/console-setup.5 2021-11-08 09:53:08.829837149 +0100 @@ -403,16 +403,16 @@ Completely covered by the following font The standard location of the .B console-setup @@ -107,9 +107,9 @@ diff -up console-setup-1.143/man/console-setup.5.orig console-setup-1.143/man/co .SH NOTES The aim of the Terminus font is to reduce the eyes-fatigue when one -diff -up console-setup-1.143/man/keyboard.5.orig console-setup-1.143/man/keyboard.5 ---- console-setup-1.143/man/keyboard.5.orig 2016-03-03 05:01:16.000000000 +0100 -+++ console-setup-1.143/man/keyboard.5 2016-05-24 09:47:15.361674281 +0200 +diff -up console-setup-1.207/man/keyboard.5.orig console-setup-1.207/man/keyboard.5 +--- console-setup-1.207/man/keyboard.5.orig 2021-11-08 09:53:21.769232920 +0100 ++++ console-setup-1.207/man/keyboard.5 2021-11-08 09:59:12.477111340 +0100 @@ -154,12 +154,12 @@ on FreeBSD. The standard location of the .B keyboard @@ -118,17 +118,17 @@ diff -up console-setup-1.143/man/keyboard.5.orig console-setup-1.143/man/keyboar +.IR /etc/default/keyboard . Description of all available keyboard models, layouts, variants and options is available in --.IR /usr/local/share/X11/xkb/rules/xorg.lst . -+.IR /usr/share/X11/xkb/rules/xorg.lst . - In most cases, in +-.IR /usr/local/share/X11/xkb/rules/base.lst . ++.IR /usr/share/X11/xkb/rules/base.lst . + In most cases, in -.IR /usr/share/keymaps/ " or " /usr/share/syscons/keymaps/ +.IR /lib/kbd/keymaps/ you will find several keymaps that can be used with the variable .BR KMAP . -diff -up console-setup-1.143/man/setupcon.1.orig console-setup-1.143/man/setupcon.1 ---- console-setup-1.143/man/setupcon.1.orig 2016-03-03 05:01:16.000000000 +0100 -+++ console-setup-1.143/man/setupcon.1 2016-05-24 09:47:15.361674281 +0200 +diff -up console-setup-1.207/man/setupcon.1.orig console-setup-1.207/man/setupcon.1 +--- console-setup-1.207/man/setupcon.1.orig 2021-11-08 09:54:23.983055071 +0100 ++++ console-setup-1.207/man/setupcon.1 2021-11-08 09:56:00.187636963 +0100 @@ -22,11 +22,11 @@ the console. Most of the time you invok without arguments. The keyboard configuration is specified in .I ~/.keyboard diff --git a/SOURCES/console-setup-1.84-ctrll-lock.patch b/SOURCES/console-setup-1.84-ctrll-lock.patch index 09fe49e..b19c218 100644 --- a/SOURCES/console-setup-1.84-ctrll-lock.patch +++ b/SOURCES/console-setup-1.84-ctrll-lock.patch @@ -1,7 +1,7 @@ -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 -@@ -196,10 +196,6 @@ my %acmtable; # Unicode -> legacy code ( +diff -up console-setup/Keyboard/ckbcomp.orig console-setup/Keyboard/ckbcomp +--- console-setup/Keyboard/ckbcomp.orig 2023-01-05 09:43:41.059205282 +0100 ++++ console-setup/Keyboard/ckbcomp 2023-01-05 09:44:49.789082563 +0100 +@@ -204,10 +204,6 @@ my %acmtable; # Unicode -> legacy code ( my $KEYMAP = ''; # This variable contains the generated keymap @@ -12,17 +12,17 @@ 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 { +@@ -4400,9 +4396,6 @@ sub print_vector { 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; - } } } if ($no_NoSymbol) { -@@ -4778,10 +4771,6 @@ keycode 127 = +@@ -4800,10 +4793,6 @@ keycode 127 = die "$0: Unsupported keyboard type $arch\n"; } @@ -32,4 +32,4 @@ diff -up console-setup-1.185/Keyboard/ckbcomp.orig console-setup-1.185/Keyboard/ - print $KEYMAP; - if ($freebsd) { + if (!$compose_charmap && $charmap) { diff --git a/SPECS/console-setup.spec b/SPECS/console-setup.spec index fb07fcd..0300d6f 100644 --- a/SPECS/console-setup.spec +++ b/SPECS/console-setup.spec @@ -1,11 +1,11 @@ Name: console-setup -Version: 1.200 -Release: 4%{?dist} +Version: 1.224 +Release: 3%{?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 -License: GPLv2+ and MIT and Public Domain +License: GPL-2.0-or-later AND MIT AND LicenseRef-Fedora-Public-Domain URL: http://packages.debian.org/cs/sid/console-setup Source0: http://ftp.de.debian.org/debian/pool/main/c/%{name}/%{name}_%{version}.tar.xz @@ -20,7 +20,7 @@ Requires: kbd # require 'xkeyboard-config' to have X Window keyboard descriptions? BuildRequires: perl-generators -BuildRequires: perl(encoding) +BuildRequires: perl(encoding) perl(open) BuildRequires: make BuildArch: noarch @@ -47,10 +47,10 @@ not wasted but used for another symbol. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .paths -%patch1 -p1 -b .fsf-address -%patch2 -p1 -b .ctrll-lock +%autopatch -p1 +cp -a --remove-destination debian/copyright COPYRIGHT +cp -a --remove-destination debian/changelog CHANGES %build make build-linux @@ -94,12 +94,125 @@ cp -a Fonts/fontsets Fonts/*.equivalents Fonts/*.set \ %changelog -* Mon Aug 09 2021 Mohan Boddu - 1.200-4 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Sat Dec 14 2024 Arkady L. Shane - 1.224-3 +- Rebuilt for MSVSphere 10 -* Thu Apr 15 2021 Mohan Boddu - 1.200-3 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Oct 29 2024 Troy Dawson - 1.224-3 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 1.224-2 +- Bump release for June 2024 mass rebuild + +* Sun Jan 28 2024 Packit - 1.224-1 +- Update to latest upstream version + +* Wed Jan 24 2024 Fedora Release Engineering - 1.223-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.223-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Oct 25 2023 Packit - 1.223-1 +- Update to latest upstream version + +* Wed Jul 19 2023 Fedora Release Engineering - 1.222-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 23 2023 Vitezslav Crhonek - 1.222-1 +- Update to latest upstream version + Resolves: #2216578 + +* Thu May 25 2023 Vitezslav Crhonek - 1.221-1 +- Update to latest upstream version + Resolves: #2208916 + +* Tue May 16 2023 Vitezslav Crhonek - 1.220-1 +- Update to latest upstream version + Resolves: #2196018 + +* Thu Apr 27 2023 Vitezslav Crhonek - 1.219-1 +- Update to latest upstream version + Resolves: #2189733 + +* Tue Mar 28 2023 Vitezslav Crhonek - 1.218-2 +- SPDX migration + +* Fri Mar 17 2023 Vitezslav Crhonek - 1.218-1 +- Update to latest upstream version + Resolves: #2178377 + +* Thu Feb 16 2023 Vitezslav Crhonek - 1.217-1 +- Update to latest upstream version + Resolves: #2170210 + +* Fri Feb 03 2023 Vitezslav Crhonek - 1.216-1 +- Update to latest upstream version + Resolves: #2166117 + +* Thu Jan 19 2023 Fedora Release Engineering - 1.215-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jan 05 2023 Vitezslav Crhonek - 1.215-1 +- Update to latest upstream version + Resolves: #2156436 + +* 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 + +* Thu Sep 15 2022 Vitezslav Crhonek - 1.210-1 +- Update to latest upstream version + Resolves: #2120120 + +* Thu Jul 21 2022 Vitezslav Crhonek - 1.209-1 +- Update to latest upstream version + Resolves: #2108201 + +* Wed Jul 20 2022 Fedora Release Engineering - 1.208-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon May 30 2022 Vitezslav Crhonek - 1.208-1 +- Update to latest upstream version + Resolves: #2090948 + +* Wed Jan 19 2022 Fedora Release Engineering - 1.207-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 09 2021 Vitezslav Crhonek - 1.207-1 +- Update to latest upstream version + Resolves: #2018840 + +* Tue Aug 31 2021 Vitezslav Crhonek - 1.205-1 +- Update to latest upstream version + Resolves: #1985584 + +* Wed Jul 21 2021 Fedora Release Engineering - 1.204-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jul 15 2021 Vitezslav Crhonek - 1.204-1 +- Update to latest upstream version + Resolves: #1980566 + +* Thu Jun 03 2021 Vitezslav Crhonek - 1.203-1 +- Update to latest upstream version + Resolves: #1965868 + +* Tue May 11 2021 Vitezslav Crhonek - 1.202-2 +- Use the "base" XKB files, not "xorg" (patch by Peter Hutterer) + Resolves: #1951453 + +* Wed Mar 24 2021 Vitezslav Crhonek - 1.202-1 +- Update to latest upstream version + Resolves: #1941247 + +* 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