From 6e0d83be61a6a5fd6e3b0c5236e97c84f7592d84 Mon Sep 17 00:00:00 2001 From: tigro Date: Tue, 12 Dec 2023 18:17:27 +0300 Subject: [PATCH] Rebuilt for MSVSphere 8.9 --- .console-setup.metadata | 2 +- .gitignore | 2 +- SOURCES/console-setup-1.84-ctrll-lock.patch | 35 ----- SPECS/console-setup.spec | 143 +------------------- 4 files changed, 8 insertions(+), 174 deletions(-) delete mode 100644 SOURCES/console-setup-1.84-ctrll-lock.patch diff --git a/.console-setup.metadata b/.console-setup.metadata index 6d8116e..1ad27d7 100644 --- a/.console-setup.metadata +++ b/.console-setup.metadata @@ -1 +1 @@ -b2aa304c5f5956f81876a765c7b1aa1de251863c SOURCES/console-setup_1.200.tar.xz +89065bc66bf609fc45bf334d0695632c2fde6994 SOURCES/console-setup_1.177.tar.xz diff --git a/.gitignore b/.gitignore index efe2eb3..7aba8bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/console-setup_1.200.tar.xz +SOURCES/console-setup_1.177.tar.xz diff --git a/SOURCES/console-setup-1.84-ctrll-lock.patch b/SOURCES/console-setup-1.84-ctrll-lock.patch deleted file mode 100644 index 09fe49e..0000000 --- a/SOURCES/console-setup-1.84-ctrll-lock.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 ( - - my $KEYMAP = ''; # This variable contains the generated keymap - --my $broken_caps = 0; # In unicode mode Caps_Lock doesn't work for non-ASCII -- # letters. 1 = the keymap contains non-ascii letters. -- # See http://bugzilla.kernel.org/show_bug.cgi?id=7746#c21 -- - my %keycodes_table; # x keysym -> x key code - my %aliases; # x keysym -> x keysym - -@@ -4378,9 +4374,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) { -- $broken_caps = 1; -- } - } - } - if ($no_NoSymbol) { -@@ -4778,10 +4771,6 @@ keycode 127 = - die "$0: Unsupported keyboard type $arch\n"; - } - --if ($broken_caps) { -- $KEYMAP =~ s/Caps_Lock/CtrlL_Lock/g; --} -- - print $KEYMAP; - - if ($freebsd) { diff --git a/SPECS/console-setup.spec b/SPECS/console-setup.spec index fb07fcd..b086698 100644 --- a/SPECS/console-setup.spec +++ b/SPECS/console-setup.spec @@ -1,9 +1,10 @@ Name: console-setup -Version: 1.200 -Release: 4%{?dist} +Version: 1.177 +Release: 1%{?dist} Summary: Tools for configuring the console using X Window System key maps +Group: Applications/System # For a breakdown of the licensing, see COPYRIGHT, copyright, copyright.fonts and copyright.xkb License: GPLv2+ and MIT and Public Domain URL: http://packages.debian.org/cs/sid/console-setup @@ -13,15 +14,12 @@ Source0: http://ftp.de.debian.org/debian/pool/main/c/%{name}/%{name}_%{version}. Patch0: console-setup-1.76-paths.patch # Fixes FSF address, sent to upstream Patch1: console-setup-1.76-fsf-address.patch -# Removes Caps_Lock to CtrlL_Lock substitution -Patch2: console-setup-1.84-ctrll-lock.patch Requires: kbd # require 'xkeyboard-config' to have X Window keyboard descriptions? BuildRequires: perl-generators BuildRequires: perl(encoding) -BuildRequires: make BuildArch: noarch %description @@ -32,24 +30,10 @@ supports several languages that would be otherwise unsupported on the console (such as Armenian, Georgian, Lao and Thai). -%package -n bdf2psf -Summary: Generate console fonts from BDF source fonts - -%description -n bdf2psf -This package provides a command-line converter that can be used in scripts -to build console fonts from BDF sources automatically. The converter comes -with a collection of font encodings that cover many of the world's -languages. The output font can use a different character encoding from the -input. When the source font does not define a glyph for a particular -symbol in the encoding table, that glyph position in the console font is -not wasted but used for another symbol. - - %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name} %patch0 -p1 -b .paths %patch1 -p1 -b .fsf-address -%patch2 -p1 -b .ctrll-lock %build @@ -64,16 +48,6 @@ make prefix=$RPM_BUILD_ROOT install-linux # or maybe have these from tarball it in optional subpackage? rm -rf $RPM_BUILD_ROOT/etc/console-setup -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -install -pm644 man/bdf2psf.1 $RPM_BUILD_ROOT%{_mandir}/man1/ - -mkdir -p $RPM_BUILD_ROOT%{_bindir} -install -p Fonts/bdf2psf $RPM_BUILD_ROOT%{_bindir} - -mkdir -p $RPM_BUILD_ROOT%{_datadir}/bdf2psf -cp -a Fonts/fontsets Fonts/*.equivalents Fonts/*.set \ - $RPM_BUILD_ROOT%{_datadir}/bdf2psf/ - %files %doc README COPYRIGHT CHANGES copyright.fonts copyright.xkb Fonts/copyright @@ -86,114 +60,9 @@ cp -a Fonts/fontsets Fonts/*.equivalents Fonts/*.set \ %{_mandir}/*/* -%files -n bdf2psf -%{_bindir}/bdf2psf -%{_mandir}/man1/bdf2psf.1* -%{_datadir}/bdf2psf -%license GPL-2 - - %changelog -* Mon Aug 09 2021 Mohan Boddu - 1.200-4 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 - -* Thu Apr 15 2021 Mohan Boddu - 1.200-3 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - -* Tue Jan 26 2021 Fedora Release Engineering - 1.200-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jan 11 2021 Vitezslav Crhonek - 1.200-1 -- Update to latest upstream version - Resolves: #1911871 - -* Mon Dec 07 2020 Vitezslav Crhonek - 1.199-1 -- Update to latest upstream version - Resolves: #1902975 - -* Mon Nov 09 2020 Vitezslav Crhonek - 1.198-1 -- Update to latest upstream version - Resolves: #1893002 - -* Tue Sep 22 2020 Vitezslav Crhonek - 1.197-1 -- Update to latest upstream version - Resolves: #1881276 - -* Mon Jul 27 2020 Fedora Release Engineering - 1.196-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 13 2020 Vitezslav Crhonek - 1.196-1 -- Update to latest upstream version - Resolves: #1856118 - -* Mon Mar 30 2020 Vitezslav Crhonek - 1.195-1 -- Update to latest upstream version - Resolves: #1817552 - -* Tue Jan 28 2020 Fedora Release Engineering - 1.194-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 19 2019 Vitezslav Crhonek - 1.194-1 -- Update to latest upstream version - Resolves: #1773413 - -* Wed Sep 04 2019 Vitezslav Crhonek - 1.193-1 -- Update to latest upstream version - Resolves: #1742489 - -* Tue Jul 30 2019 Vitezslav Crhonek - 1.192-1 -- Update to latest upstream version - Resolves: #1727182 - -* Wed Jul 24 2019 Fedora Release Engineering - 1.191-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Apr 30 2019 Vitezslav Crhonek - 1.191-1 -- Update to latest upstream version - Resolves: #1692077 - -* Tue Mar 19 2019 Vitezslav Crhonek - 1.190-1 -- Update to latest upstream version - Resolves: #1685067 - -* Fri Mar 08 2019 Lubomir Rintel - 1.189-2 -- Package bdf2psf as well - -* Tue Feb 12 2019 Vitezslav Crhonek - 1.189-1 -- Update to latest upstream version - Resolves: #1674091 - -* Thu Jan 31 2019 Fedora Release Engineering - 1.186-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Oct 04 2018 Vitezslav Crhonek - 1.186-1 -- Update to latest upstream version - Resolves: 1632056 - -* Mon Aug 27 2018 Vitezslav Crhonek - 1.185-1 -- Update to latest upstream version - Resolves: #1616114 - -* Thu Jul 12 2018 Fedora Release Engineering - 1.184-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jun 28 2018 Vitezslav Crhonek - 1.184-2 -- Remove Caps Lock to CtrlL_Lock substitution - Resolves: #1586149 - -* Thu Apr 19 2018 Vitezslav Crhonek - 1.184-1 -- Update to latest upstream version - Resolves: #1562605 - -* Wed Mar 28 2018 Vitezslav Crhonek - 1.181-1 -- Update to latest upstream version - Resolves: #1556587 - -* Wed Mar 14 2018 Vitezslav Crhonek - 1.179-1 -- Remove Group tag -- Update to latest upstream version - Resolves: #1545959 +* Tue Dec 12 2023 Arkady L. Shane - 1.177-1 +- Rebuilt for MSVSphere 8.9 * Wed Feb 07 2018 Vitezslav Crhonek - 1.177-1 - Update to latest upstream version