rpms/console-setup
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to latest upstream version

Browse Source 
Signed-off-by: Vitezslav Crhonek <vcrhonek@redhat.com>
This commit is contained in:
Vitezslav Crhonek 2021-11-09 13:20:13 +01:00
parent 1ca44300bd
commit 5120b84e41
5 changed files with 26 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
/console-setup_1.205.tar.xz /console-setup_1.207.tar.xz

42
console-setup-1.202-use-base-xkb-files.patch
View File

@ -1,42 +0,0 @@
diff -up console-setup-1.202/Keyboard/ckbcomp.orig console-setup-1.202/Keyboard/ckbcomp
--- console-setup-1.202/Keyboard/ckbcomp.orig 2021-05-11 14:19:31.003284483 +0200
+++ console-setup-1.202/Keyboard/ckbcomp 2021-05-11 14:21:01.047140800 +0200
@@ -181,7 +181,7 @@ EOT
}
}
-$rules = 'xorg' if (! $rules);
+$rules = 'base' if (! $rules);
$model = 'pc104' if (! $model);
$backspace = $freebsd ? 'bs' : 'del' if (! $backspace);
diff -up console-setup-1.202/Keyboard/Makefile.orig console-setup-1.202/Keyboard/Makefile
--- console-setup-1.202/Keyboard/Makefile.orig 2020-06-23 14:21:52.000000000 +0200
+++ console-setup-1.202/Keyboard/Makefile 2021-05-11 14:20:19.575757490 +0200
@@ -83,4 +83,4 @@ $~maintainer-clean: $~clean
cd $(kbddir) && ./xmlreader >KeyboardNames.pl
$./KeyboardNames.pl:
- $(kbddir)/xmlreader $(xkbdir)/rules/xorg.xml >$@
+ $(kbddir)/xmlreader $(xkbdir)/rules/base.xml >$@
diff -up console-setup-1.202/man/keyboard.5.orig console-setup-1.202/man/keyboard.5
--- console-setup-1.202/man/keyboard.5.orig 2021-05-11 14:19:30.999284443 +0200
+++ console-setup-1.202/man/keyboard.5 2021-05-11 14:22:47.877051436 +0200
@@ -24,7 +24,7 @@ file is based on the
.SM XKB
options XkbModel, XkbLayout, XkbVariant and XkbOptions.
Unfortunately, there is little documentation how to use them. Description of all possible values for these options can be found in the file
-.IR xorg.lst .
+.IR base.lst .
.P
You might want to read \*(lqThe XKB Configuration Guide\*(rq by Kamil
Toman and Ivan U. Pascal:
@@ -157,7 +157,7 @@ file is
.IR /etc/default/keyboard .
Description of all available keyboard models, layouts, variants and
options is available in
-.IR /usr/share/X11/xkb/rules/xorg.lst .
+.IR /usr/share/X11/xkb/rules/base.lst .
In most cases, in
.IR /lib/kbd/keymaps/
you will find several keymaps that can be used with the variable

36
console-setup-1.76-paths.patch
View File

@ -1,12 +1,12 @@
diff -up console-setup-1.143/Makefile.orig console-setup-1.143/Makefile diff -up console-setup-1.207/Makefile.orig console-setup-1.207/Makefile
--- console-setup-1.143/Makefile.orig 2016-05-24 09:43:13.424382839 +0200 --- console-setup-1.207/Makefile.orig 2021-11-08 09:46:06.508441480 +0100
+++ console-setup-1.143/Makefile 2016-05-24 09:45:10.350994606 +0200 +++ console-setup-1.207/Makefile 2021-11-08 09:48:57.683728853 +0100
@@ -14,7 +14,7 @@ prefix := /usr/local @@ -14,7 +14,7 @@ prefix := /usr/local
# etcdir must be either /etc or # etcdir must be either /etc or
etcdir := $(prefix)/etc etcdir := $(prefix)/etc
bootprefix := $(patsubst %/usr,%/,$(prefix:%/=%)) bootprefix := $(patsubst %/usr,%/,$(prefix:%/=%))
-mandir := $(prefix)/share/man -mandir := $(prefix)/share/man
+mandir = $(prefix)/usr/share/man +mandir := $(prefix)/usr/share/man
acmfiles := $(wildcard $./acm/*.acm) 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 -d $(mandir)/man1/
install -m 644 man/ckbcomp.1 $(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 diff -up console-setup-1.207/man/ckbcomp.1.orig console-setup-1.207/man/ckbcomp.1
--- console-setup-1.143/man/ckbcomp.1.orig 2011-04-06 03:01:33.000000000 +0200 --- console-setup-1.207/man/ckbcomp.1.orig 2011-07-03 19:59:48.000000000 +0200
+++ console-setup-1.143/man/ckbcomp.1 2016-05-24 09:47:15.360674275 +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. @@ -46,7 +46,7 @@ Print a usage message and exit.
.BI -charmap\ charmap .BI -charmap\ charmap
The encoding to use for the output keymap. There should be an 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 .br
.I /usr/share/X11/xkb .I /usr/share/X11/xkb
.br .br
diff -up console-setup-1.143/man/console-setup.5.orig console-setup-1.143/man/console-setup.5 diff -up console-setup-1.207/man/console-setup.5.orig console-setup-1.207/man/console-setup.5
--- console-setup-1.143/man/console-setup.5.orig 2016-05-19 05:01:09.000000000 +0200 --- console-setup-1.207/man/console-setup.5.orig 2019-05-30 00:09:36.000000000 +0200
+++ console-setup-1.143/man/console-setup.5 2016-05-24 09:47:15.361674281 +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 @@ -403,16 +403,16 @@ Completely covered by the following font
The standard location of the The standard location of the
.B console-setup .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 .SH NOTES
The aim of the Terminus font is to reduce the eyes-fatigue when one 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 diff -up console-setup-1.207/man/keyboard.5.orig console-setup-1.207/man/keyboard.5
--- console-setup-1.143/man/keyboard.5.orig 2016-03-03 05:01:16.000000000 +0100 --- console-setup-1.207/man/keyboard.5.orig 2021-11-08 09:53:21.769232920 +0100
+++ console-setup-1.143/man/keyboard.5 2016-05-24 09:47:15.361674281 +0200 +++ console-setup-1.207/man/keyboard.5 2021-11-08 09:59:12.477111340 +0100
@@ -154,12 +154,12 @@ on FreeBSD. @@ -154,12 +154,12 @@ on FreeBSD.
The standard location of the The standard location of the
.B keyboard .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 . +.IR /etc/default/keyboard .
Description of all available keyboard models, layouts, variants and Description of all available keyboard models, layouts, variants and
options is available in options is available in
-.IR /usr/local/share/X11/xkb/rules/xorg.lst . -.IR /usr/local/share/X11/xkb/rules/base.lst .
+.IR /usr/share/X11/xkb/rules/xorg.lst . +.IR /usr/share/X11/xkb/rules/base.lst .
In most cases, in In most cases, in
-.IR /usr/share/keymaps/ " or " /usr/share/syscons/keymaps/ -.IR /usr/share/keymaps/ " or " /usr/share/syscons/keymaps/
+.IR /lib/kbd/keymaps/ +.IR /lib/kbd/keymaps/
you will find several keymaps that can be used with the variable you will find several keymaps that can be used with the variable
.BR KMAP . .BR KMAP .
diff -up console-setup-1.143/man/setupcon.1.orig console-setup-1.143/man/setupcon.1 diff -up console-setup-1.207/man/setupcon.1.orig console-setup-1.207/man/setupcon.1
--- console-setup-1.143/man/setupcon.1.orig 2016-03-03 05:01:16.000000000 +0100 --- console-setup-1.207/man/setupcon.1.orig 2021-11-08 09:54:23.983055071 +0100
+++ console-setup-1.143/man/setupcon.1 2016-05-24 09:47:15.361674281 +0200 +++ 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 @@ -22,11 +22,11 @@ the console. Most of the time you invok
without arguments. The keyboard configuration is specified in without arguments. The keyboard configuration is specified in
.I ~/.keyboard .I ~/.keyboard

9
console-setup.spec
View File

@ -1,6 +1,6 @@
Name: console-setup Name: console-setup
Version: 1.205 Version: 1.207
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
@ -15,8 +15,6 @@ Patch0: console-setup-1.76-paths.patch
Patch1: console-setup-1.76-fsf-address.patch Patch1: console-setup-1.76-fsf-address.patch
# Removes Caps_Lock to CtrlL_Lock substitution # Removes Caps_Lock to CtrlL_Lock substitution
Patch2: console-setup-1.84-ctrll-lock.patch Patch2: console-setup-1.84-ctrll-lock.patch
# Use the "base" XKB files, not "xorg", patch by Peter Hutterer, sent to upstream, see bz#1951453
Patch3: console-setup-1.202-use-base-xkb-files.patch
Requires: kbd Requires: kbd
# require 'xkeyboard-config' to have X Window keyboard descriptions? # require 'xkeyboard-config' to have X Window keyboard descriptions?
@ -52,7 +50,6 @@ not wasted but used for another symbol.
%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
%patch3 -p1 -b .use-base-xkb-files
%build %build
@ -97,6 +94,10 @@ cp -a Fonts/fontsets Fonts/*.equivalents Fonts/*.set \
%changelog %changelog
* Tue Nov 09 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.207-1
- Update to latest upstream version
Resolves: #2018840
* Tue Aug 31 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.205-1 * Tue Aug 31 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.205-1
- Update to latest upstream version - Update to latest upstream version
Resolves: #1985584 Resolves: #1985584

2
sources
View File

@ -1 +1 @@
SHA512 (console-setup_1.205.tar.xz) = 757643f040542fda2903ffaa35a311c6c572b4c1e9c6c169a032e85a360bfe7d64e66ad66fba988515a4c1004ae4ecb45a40fba5c0a9eec6bd58abc1e0624b15 SHA512 (console-setup_1.207.tar.xz) = 0652b43c2488246e5bf7fac7ad5dc7986ba0ae832ae2179d2ade14da0412639f9055216e6a5e73a7a7c682d4e606441bf3a24dd5dbce0c3b0aff8416571587e5