console-setup-1.76-paths.patch

@@ -1,12 +1,12 @@
-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
+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
 @@ -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.207/Makefile.orig console-setup-1.207/Makefile
  	install -d $(mandir)/man1/
  	install -m 644 man/ckbcomp.1 $(mandir)/man1/
  
-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
+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
 @@ -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.207/man/ckbcomp.1.orig console-setup-1.207/man/ckbcomp.
  .br
  .I /usr/share/X11/xkb
  .br
-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
+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
 @@ -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.207/man/console-setup.5.orig console-setup-1.207/man/co
  
  .SH NOTES
  The aim of the Terminus font is to reduce the eyes-fatigue when one
-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
+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
 @@ -154,12 +154,12 @@ on FreeBSD.
  The standard location of the
  .B keyboard
@@ -118,17 +118,17 @@ diff -up console-setup-1.207/man/keyboard.5.orig console-setup-1.207/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/base.lst .
-+.IR /usr/share/X11/xkb/rules/base.lst .
+-.IR /usr/local/share/X11/xkb/rules/xorg.lst .
++.IR /usr/share/X11/xkb/rules/xorg.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.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
+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
 @@ -22,11 +22,11 @@ the console.  Most of the time you invok
  without arguments.  The keyboard configuration is specified in
  .I ~/.keyboard

console-setup-1.84-ctrll-lock.patch

@@ -1,7 +1,7 @@
 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 (
+--- console-setup/Keyboard/ckbcomp.orig	2018-06-21 10:58:36.262160943 +0200
++++ console-setup/Keyboard/ckbcomp	2018-06-27 13:04:01.843639711 +0200
+@@ -196,10 +196,6 @@ my %acmtable; # Unicode -> legacy code (
  
  my $KEYMAP = ''; # This variable contains the generated keymap
  
@@ -12,17 +12,17 @@ diff -up console-setup/Keyboard/ckbcomp.orig console-setup/Keyboard/ckbcomp
  my %keycodes_table; # x keysym -> x key code
  my %aliases;        # x keysym -> x keysym
  
-@@ -4400,9 +4396,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);
--		if ($v != $c && $v > 0x7f) {
+-		if ($v != $c && $v gt 0x7f) {
 -		    $broken_caps = 1;
 -		}
  	    }
  	}
  	if ($no_NoSymbol) {
-@@ -4800,10 +4793,6 @@ keycode 127 =
+@@ -4776,10 +4769,6 @@ keycode 127 =
      die "$0: Unsupported keyboard type $arch\n";
  }
  
@@ -32,4 +32,4 @@ diff -up console-setup/Keyboard/ckbcomp.orig console-setup/Keyboard/ckbcomp
 -
  print $KEYMAP;
  
- if (!$compose_charmap && $charmap) {
+ if ($freebsd) {

console-setup.spec

@@ -1,10 +1,11 @@
 Name:           console-setup
-Version:        1.218
-Release:        1
+Version:        1.184
+Release:        4
 Summary:        Console font and keymap setup program
 License:        GPLv2+ and MIT and Public Domain
 URL:            https://packages.debian.org/cs/sid/console-setup
 Source0:        http://ftp.de.debian.org/debian/pool/main/c/%{name}/%{name}_%{version}.tar.xz
+
 Patch0:		console-setup-1.76-paths.patch
 Patch1:		console-setup-1.76-fsf-address.patch
 Patch2:		console-setup-1.84-ctrll-lock.patch
@@ -26,10 +27,7 @@ TerminusBoldVGA.
 %package_help
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .paths
-%patch1 -p1 -b .fsf-address
-%patch2 -p1 -b .ctrll-lock1
+%autosetup -n %{name} -p1
 
 %build
 make build-linux
@@ -49,17 +47,5 @@ make prefix=%{buildroot} install-linux
 %{_mandir}/man*/*
 
 %changelog
-* Mon Apr 17 2023 yaoxin <yao_xin001@hoperun.com> - 1.218-1
-- Update to 1.218
-
-* Tue Jan 18 2022 SimpleUpdate Robot <tc@openeuler.org> - 1.207-1
-- Upgrade to version 1.207
-
-* Sun Sep 27 2020 yanan <yanan@huawei.com> - 1.184-6
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:Remove Caps Lock to CtrlL_Lock substitution
-
-* Mon Dec 9 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.184-5
+* Mon Dec 9 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.184-4
 - Package init

console-setup.yaml

@@ -1,4 +0,0 @@
-version_control: NA
-src_repo: NA
-tag_prefix: NA
-seperator: NA