From d0a74b012843483db87f129736a5db6cca56e4fea4b9fa8e8ace5a906a87ec3e Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 31 Dec 2022 10:02:11 +0000 Subject: [PATCH] Accepting request 1045862 from home:XRevan86 - Update to version 1.215. OBS-URL: https://build.opensuse.org/request/show/1045862 OBS-URL: https://build.opensuse.org/package/show/Base:System/console-setup?expand=0&rev=15 --- 0001-ckbcomp-Fix-check-for-non-ascii.patch | 34 --- console-setup-1.134-perl526.patch | 13 -- console-setup-1.134-reproducible.patch | 35 --- console-setup-1.76-paths.patch | 168 -------------- console-setup-paths.patch | 249 +++++++++++++++++++++ console-setup.changes | 15 ++ console-setup.spec | 100 +++++---- console-setup_1.134.tar.xz | 3 - console-setup_1.215.tar.xz | 3 + u_fix-iso-left-tab.patch | 26 --- 10 files changed, 326 insertions(+), 320 deletions(-) delete mode 100644 0001-ckbcomp-Fix-check-for-non-ascii.patch delete mode 100644 console-setup-1.134-perl526.patch delete mode 100644 console-setup-1.134-reproducible.patch delete mode 100644 console-setup-1.76-paths.patch create mode 100644 console-setup-paths.patch delete mode 100644 console-setup_1.134.tar.xz create mode 100644 console-setup_1.215.tar.xz delete mode 100644 u_fix-iso-left-tab.patch diff --git a/0001-ckbcomp-Fix-check-for-non-ascii.patch b/0001-ckbcomp-Fix-check-for-non-ascii.patch deleted file mode 100644 index 5262420..0000000 --- a/0001-ckbcomp-Fix-check-for-non-ascii.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c73920250a124b9c6a73ed7211af74df993d449b Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Mon, 12 Dec 2022 09:54:11 +0100 -Subject: [PATCH] ckbcomp: Fix check for non-ascii - -It did a string comparision with "127" (0x7f converted to string) which is -true also for characters below 100, like '1' (51) or 'Q' (81) because the -first letter of the string representation of their ASCII value is > '1'. - -This bug meant that even maps which didn't need it had $broken_caps = 1, -leading to Caps_Lock getting replaced by CtrlL_Lock. With this patch, maps -like 'us' use Caps_Lock again. - -Signed-off-by: Fabian Vogt ---- - Keyboard/ckbcomp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Keyboard/ckbcomp b/Keyboard/ckbcomp -index adbcd79..6108fff 100755 ---- a/Keyboard/ckbcomp -+++ b/Keyboard/ckbcomp -@@ -4376,7 +4376,7 @@ 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; - } - } --- -2.38.1 - diff --git a/console-setup-1.134-perl526.patch b/console-setup-1.134-perl526.patch deleted file mode 100644 index 034054a..0000000 --- a/console-setup-1.134-perl526.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: console-setup-1.134/Keyboard/compose_translator -=================================================================== ---- console-setup-1.134.orig/Keyboard/compose_translator -+++ console-setup-1.134/Keyboard/compose_translator -@@ -19,7 +19,7 @@ - - use warnings 'all'; - use strict; --use encoding 'utf8'; -+use utf8; - binmode STDOUT, ':bytes'; - - sub debug { diff --git a/console-setup-1.134-reproducible.patch b/console-setup-1.134-reproducible.patch deleted file mode 100644 index cb4a718..0000000 --- a/console-setup-1.134-reproducible.patch +++ /dev/null @@ -1,35 +0,0 @@ -Date: 2018-01-05 -By: Bernhard M. Wiedemann - -PATCH-FIX-UPSTREAM in 1.174 - -dont add timestamps to .gz headers - -generate reproducible random output for missing glyphs - -Index: console-setup-1.134/Fonts/Makefile -=================================================================== ---- console-setup-1.134.orig/Fonts/Makefile -+++ console-setup-1.134/Fonts/Makefile -@@ -7,7 +7,7 @@ build-any: - - - %.gz : % -- gzip -9 <$< >$@ -+ gzip -n9 <$< >$@ - - # All available non-legacy font faces - FACES = Fixed13 Fixed14 Fixed15 Fixed16 \ -Index: console-setup-1.134/Fonts/bdf2psf -=================================================================== ---- console-setup-1.134.orig/Fonts/bdf2psf -+++ console-setup-1.134/Fonts/bdf2psf -@@ -21,6 +21,8 @@ - - use warnings 'all'; - use strict; -+srand(0); -+ - - ##################################################################### - diff --git a/console-setup-1.76-paths.patch b/console-setup-1.76-paths.patch deleted file mode 100644 index 8165aca..0000000 --- a/console-setup-1.76-paths.patch +++ /dev/null @@ -1,168 +0,0 @@ -Index: console-setup-1.130/Makefile -=================================================================== ---- console-setup-1.130.orig/Makefile -+++ console-setup-1.130/Makefile -@@ -2,7 +2,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 - - SHELL = /bin/sh - -@@ -36,8 +36,8 @@ build-all: build-linux build-freebsd bui - - .PHONY: install-common - install-common: build-common -- install -d $(bootprefix)/bin/ -- install setupcon $(bootprefix)/bin/ -+ install -d $(bootprefix)/usr/bin/ -+ install setupcon $(bootprefix)/usr/bin/ - install -d $(etcdir)/default - install -m 644 config/keyboard $(etcdir)/default/ - install -m 644 config/console-setup $(etcdir)/default/ -@@ -49,10 +49,10 @@ install-common: build-common - - .PHONY: install-common-linux - install-common-linux: build-linux -- install -d $(prefix)/share/consolefonts/ -- install -m 644 Fonts/*.psf.gz $(prefix)/share/consolefonts/ -- install -d $(prefix)/share/consoletrans -- install -m 644 acm/*.acm.gz $(prefix)/share/consoletrans/ -+ install -d $(prefix)/usr/share/consolefonts/ -+ install -m 644 Fonts/*.psf.gz $(prefix)/usr/share/consolefonts/ -+ install -d $(prefix)/usr/share/consoletrans -+ install -m 644 acm/*.acm.gz $(prefix)/usr/share/consoletrans/ - install -d $(etcdir)/console-setup - install -m 644 Keyboard/compose.*.inc $(etcdir)/console-setup/ - install -m 644 Keyboard/remap.inc $(etcdir)/console-setup/ -@@ -77,8 +77,8 @@ install-ckbcomp: - mkdir -p $(etcdir)/console-setup \ - && cp -r Keyboard/ckb/ $(etcdir)/console-setup/ckb; \ - fi -- install -d $(prefix)/bin/ -- install -m 755 Keyboard/ckbcomp $(prefix)/bin/ -+ install -d $(prefix)/usr/bin/ -+ install -m 755 Keyboard/ckbcomp $(prefix)/usr/bin/ - install -d $(mandir)/man1/ - install -m 644 man/ckbcomp.1 $(mandir)/man1/ - -Index: console-setup-1.130/man/ckbcomp.1 -=================================================================== ---- console-setup-1.130.orig/man/ckbcomp.1 -+++ console-setup-1.130/man/ckbcomp.1 -@@ -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 - character mapping table defining this encoding in --.IR /usr/local/share/consoletrans . -+.IR /usr/share/consoletrans . - Definitions of the following charmaps are provided: - .nh - .BR ARMSCII-8 , -@@ -86,8 +86,9 @@ for files included by the keymap descrip - multiple times. If a file can not be found in any of the specified - directories, it will be searched also in some other standard - locations, such as --.IR /usr/local/etc/console-setup/ckb , --.IR /usr/local/share/X11/xkb -+.IR /etc/console-setup/ckb , -+.IR /usr/local/share/X11/xkb , -+.IR /usr/share/X11/xkb - and - .IR /etc/X11/xkb - -@@ -167,9 +168,9 @@ Specifies the layout variant used to cho - Adds an option used to choose component names. - - .SH FILES --.I /usr/local/share/consoletrans -+.I /usr/share/consoletrans - .br --.I /usr/local/etc/console-setup/ckb -+.I /etc/console-setup/ckb - .br - .I /usr/share/X11/xkb - .br -Index: console-setup-1.130/man/console-setup.5 -=================================================================== ---- console-setup-1.130.orig/man/console-setup.5 -+++ console-setup-1.130/man/console-setup.5 -@@ -378,16 +378,16 @@ Completely covered by the following font - The standard location of the - .B console-setup - configuration file is --.IR /usr/local/etc/default/console-setup . -+.IR /etc/default/console-setup . - The keyboard configuration is in --.IR /usr/local/etc/default/keyboard . -+.IR /etc/default/keyboard . - Fonts that can be used with the variable - .B FONT - are usually installed in --.IR /usr/share/consolefonts/ " or " /usr/share/syscons/fonts/ . -+.IR /usr/share/consolefonts/ " or " /lib/kbd/consolefonts/ . - Translation maps that can be used with the variable CONSOLE_MAP are - usually installed in --.IR /usr/share/consoletrans/ " or " /usr/share/syscons/scrnmaps/ . -+.IR /usr/share/consoletrans/ " or " /lib/kbd/consoletrans/ . - - .SH NOTES - The aim of the Terminus font is to reduce the eyes-fatigue when one -Index: console-setup-1.130/man/keyboard.5 -=================================================================== ---- console-setup-1.130.orig/man/keyboard.5 -+++ console-setup-1.130/man/keyboard.5 -@@ -154,12 +154,12 @@ on FreeBSD. - The standard location of the - .B keyboard - file is --.IR /usr/local/etc/default/keyboard . -+.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/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 . - -Index: console-setup-1.130/man/setupcon.1 -=================================================================== ---- console-setup-1.130.orig/man/setupcon.1 -+++ console-setup-1.130/man/setupcon.1 -@@ -22,11 +22,11 @@ the console. Most of the time you invok - without arguments. The keyboard configuration is specified in - .I ~/.keyboard - or --.IR /usr/local/etc/default/keyboard . -+.IR /etc/default/keyboard . - The font configuration is specified in - .I ~/.console-setup - or --.IR /usr/local/etc/default/console-setup . -+.IR /etc/default/console-setup . - Consult - .BR keyboard (5) - and -@@ -151,13 +151,13 @@ Display usage information. - .br - .I ~/.keyboard - .br --.I /usr/local/etc/default/console-setup -+.I /etc/default/console-setup - .br --.I /usr/local/etc/default/keyboard -+.I /etc/default/keyboard - .br --.I /usr/local/etc/default/console-setup.VARIANT -+.I /etc/default/console-setup.VARIANT - .br --.I /usr/local/etc/default/keyboard.VARIANT -+.I /etc/default/keyboard.VARIANT - .br - .I /etc/console-setup/ - diff --git a/console-setup-paths.patch b/console-setup-paths.patch new file mode 100644 index 0000000..bf458bd --- /dev/null +++ b/console-setup-paths.patch @@ -0,0 +1,249 @@ +--- a/Keyboard/ckbcomp ++++ b/Keyboard/ckbcomp +@@ -3273,14 +3273,14 @@ if ($keycodes =~ /(^|\+|\|)ataritt(\([^\ + ########### READ ACM ############################################### + + if ($charmap) { +- for my $acmfile ("$installdir/share/consoletrans/${charmap}", +- "$installdir/share/consoletrans/${charmap}.gz", +- "$installdir/share/consoletrans/${charmap}.acm", +- "$installdir/share/consoletrans/${charmap}.acm.gz", +- "/usr/share/consoletrans/${charmap}", +- "/usr/share/consoletrans/${charmap}.gz", +- "/usr/share/consoletrans/${charmap}.acm", +- "/usr/share/consoletrans/${charmap}.acm.gz", ++ for my $acmfile ("$installdir/share/kbd/consoletrans/${charmap}", ++ "$installdir/share/kbd/consoletrans/${charmap}.gz", ++ "$installdir/share/kbd/consoletrans/${charmap}.acm", ++ "$installdir/share/kbd/consoletrans/${charmap}.acm.gz", ++ "/usr/share/kbd/consoletrans/${charmap}", ++ "/usr/share/kbd/consoletrans/${charmap}.gz", ++ "/usr/share/kbd/consoletrans/${charmap}.acm", ++ "/usr/share/kbd/consoletrans/${charmap}.acm.gz", + "${charmap}") { + if (-f $acmfile) { + $acm = $acmfile; +--- a/Keyboard/compose_translator ++++ b/Keyboard/compose_translator +@@ -51,10 +51,10 @@ my %uni2acm; + my %acm2uni; + if ($acm) { + for my $acmfile ("${acm}", "${acm}.gz", "${acm}.acm", "${acm}.acm.gz", +- "/usr/share/consoletrans/${acm}", +- "/usr/share/consoletrans/${acm}.gz", +- "/usr/share/consoletrans/${acm}.acm", +- "/usr/share/consoletrans/${acm}.acm.gz",) { ++ "/usr/share/kbd/consoletrans/${acm}", ++ "/usr/share/kbd/consoletrans/${acm}.gz", ++ "/usr/share/kbd/consoletrans/${acm}.acm", ++ "/usr/share/kbd/consoletrans/${acm}.acm.gz",) { + if (-f $acmfile) { + $acm = $acmfile; + last; +--- a/Makefile ++++ b/Makefile +@@ -11,9 +11,9 @@ include Fonts/Makefile + ~ := main + + prefix := /usr/local +-# etcdir must be either /etc or +-etcdir := $(prefix)/etc + bootprefix := $(patsubst %/usr,%/,$(prefix:%/=%)) ++# etcdir must be either /etc or /usr/etc ++etcdir := $(bootprefix)/etc + mandir := $(prefix)/share/man + + acmfiles := $(wildcard $./acm/*.acm) +@@ -26,8 +26,8 @@ build-common: gzipped-acmfiles + + .PHONY: install-common + install-common: build-common +- install -d $(bootprefix)/bin/ +- install setupcon $(bootprefix)/bin/ ++ install -d $(prefix)/bin/ ++ install setupcon $(prefix)/bin/ + install -d $(etcdir)/default + install -m 644 config/keyboard $(etcdir)/default/ + install -m 644 config/console-setup $(etcdir)/default/ +@@ -39,10 +39,11 @@ install-common: build-common + + .PHONY: install-common-linux + install-common-linux: build-linux +- install -d $(prefix)/share/consolefonts/ +- install -m 644 Fonts/*.psf.gz $(prefix)/share/consolefonts/ +- install -d $(prefix)/share/consoletrans +- install -m 644 acm/*.acm.gz $(prefix)/share/consoletrans/ ++ install -d $(prefix)/share/kbd ++ install -d $(prefix)/share/kbd/consolefonts/ ++ install -m 644 Fonts/*.psf.gz $(prefix)/share/kbd/consolefonts/ ++ install -d $(prefix)/share/kbd/consoletrans ++ install -m 644 acm/*.acm.gz $(prefix)/share/kbd/consoletrans/ + install -d $(etcdir)/console-setup + install -m 644 Keyboard/compose.*.inc $(etcdir)/console-setup/ + install -m 644 Keyboard/remap.inc $(etcdir)/console-setup/ +@@ -53,8 +54,8 @@ install-common-freebsd: build-freebsd + install -m 644 Fonts/*.fnt $(prefix)/share/syscons/fonts/ + install -d $(prefix)/share/syscons/scrnmaps/ + install -m 644 Fonts/*.scm $(prefix)/share/syscons/scrnmaps/ +- install -d $(prefix)/share/consoletrans +- install -m 644 acm/*.acm $(prefix)/share/consoletrans/ ++ install -d $(prefix)/share/kbd/consoletrans ++ install -m 644 acm/*.acm $(prefix)/share/kbd/consoletrans/ + install -d $(etcdir)/console-setup + install -m 644 Fonts/terminfo $(etcdir)/console-setup/ + install -m 644 Fonts/termcap $(etcdir)/console-setup/ +@@ -99,10 +100,10 @@ install-mini-freebsd: install-common ins + + common-uninstall: | build-linux build-mini-linux build-freebsd build-mini-freebsd + -for font in Fonts/*.psf.gz; do \ +- rm $(prefix)/share/consolefonts/$${font##*/}; \ ++ rm $(prefix)/share/kbd/consolefonts/$${font##*/}; \ + done + -for acm in acm/*.acm.gz acm/*.acm; do \ +- rm $(prefix)/share/consoletrans/$${acm##*/}; \ ++ rm $(prefix)/share/kbd/consoletrans/$${acm##*/}; \ + done + -for font in Fonts/*.fnt; do \ + rm $(prefix)/share/syscons/fonts/$${font##*/}; \ +@@ -119,7 +120,7 @@ common-uninstall: | build-linux build-mi + -rm $(etcdir)/default/keyboard + -rm $(etcdir)/default/console-setup + -rm $(prefix)/bin/ckbcomp +- -rm $(bootprefix)/bin/setupcon ++ -rm $(prefix)/bin/setupcon + + .PHONY: uninstall-linux + uninstall-linux: build-linux common-uninstall +--- a/man/ckbcomp.1 ++++ b/man/ckbcomp.1 +@@ -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 + character mapping table defining this encoding in +-.IR /usr/local/share/consoletrans . ++.IR /usr/share/kbd/consoletrans . + Definitions of the following charmaps are provided: + .nh + .BR ARMSCII-8 , +@@ -86,8 +86,9 @@ for files included by the keymap descrip + multiple times. If a file can not be found in any of the specified + directories, it will be searched also in some other standard + locations, such as +-.IR /usr/local/etc/console-setup/ckb , +-.IR /usr/local/share/X11/xkb ++.IR /etc/console-setup/ckb , ++.IR /usr/local/share/X11/xkb , ++.IR /usr/share/X11/xkb + and + .IR /etc/X11/xkb + +@@ -167,9 +168,9 @@ Specifies the layout variant used to cho + Adds an option used to choose component names. + + .SH FILES +-.I /usr/local/share/consoletrans ++.I /usr/share/kbd/consoletrans + .br +-.I /usr/local/etc/console-setup/ckb ++.I /etc/console-setup/ckb + .br + .I /usr/share/X11/xkb + .br +--- a/man/console-setup.5 ++++ b/man/console-setup.5 +@@ -403,16 +403,16 @@ Completely covered by the following font + The standard location of the + .B console-setup + configuration file is +-.IR /usr/local/etc/default/console-setup . ++.IR /etc/default/console-setup . + The keyboard configuration is in +-.IR /usr/local/etc/default/keyboard . ++.IR /etc/default/keyboard . + Fonts that can be used with the variable + .B FONT + are usually installed in +-.IR /usr/share/consolefonts/ " or " /usr/share/syscons/fonts/ . ++.IR /usr/share/kbd/consolefonts/ " or " /usr/share/consolefonts/ . + Translation maps that can be used with the variable CONSOLE_MAP are + usually installed in +-.IR /usr/share/consoletrans/ " or " /usr/share/syscons/scrnmaps/ . ++.IR /usr/share/kbd/consoletrans/ " or " /usr/share/consoletrans/ . + + .SH NOTES + The aim of the Terminus font is to reduce the eyes-fatigue when one +--- a/man/keyboard.5 ++++ b/man/keyboard.5 +@@ -154,12 +154,12 @@ on FreeBSD. + The standard location of the + .B keyboard + file is +-.IR /usr/local/etc/default/keyboard . ++.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 . + In most cases, in +-.IR /usr/share/keymaps/ " or " /usr/share/syscons/keymaps/ ++.IR /usr/share/kbd/keymaps/ + you will find several keymaps that can be used with the variable + .BR KMAP . + +--- a/man/setupcon.1 ++++ b/man/setupcon.1 +@@ -22,11 +22,11 @@ the console. Most of the time you invok + without arguments. The keyboard configuration is specified in + .I ~/.keyboard + or +-.IR /usr/local/etc/default/keyboard . ++.IR /etc/default/keyboard . + The font configuration is specified in + .I ~/.console-setup + or +-.IR /usr/local/etc/default/console-setup . ++.IR /etc/default/console-setup . + Consult + .BR keyboard (5) + and +@@ -162,13 +162,13 @@ Display usage information. + .br + .I ~/.keyboard + .br +-.I /usr/local/etc/default/console-setup ++.I /etc/default/console-setup + .br +-.I /usr/local/etc/default/keyboard ++.I /etc/default/keyboard + .br +-.I /usr/local/etc/default/console-setup.VARIANT ++.I /etc/default/console-setup.VARIANT + .br +-.I /usr/local/etc/default/keyboard.VARIANT ++.I /etc/default/keyboard.VARIANT + .br + .I /etc/console-setup/ + +--- a/setupcon ++++ b/setupcon +@@ -644,9 +644,9 @@ esac + # mapdir, fontdir, stdfont, stdfontfallback + case "$kernel" in + linux) +- mapdir=share/consoletrans ++ mapdir=share/kbd/consoletrans + stdmap=$CHARMAP.acm.gz +- fontdir=share/consolefonts ++ fontdir=share/kbd/consolefonts + stdfont=$CODESET-$FONTFACE$FONTSIZE.psf.gz + # [A-WXYZa-wyz] is a funny way to say [A-Za-wyz]. In some locales + # [A-Z] includes x and we don't want this. +@@ -716,7 +716,7 @@ fi + # FONTMAPFILE + FONTMAPFILE='' + if [ "$kernel" = linux -a -n "$FONT_MAP" ]; then +- FONTMAPFILE=`findfile share/consoletrans "$FONT_MAP"` ++ FONTMAPFILE=`findfile share/kbd/consoletrans "$FONT_MAP"` + fi + + # XKBMODEL diff --git a/console-setup.changes b/console-setup.changes index 749d05d..8b70362 100644 --- a/console-setup.changes +++ b/console-setup.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Dec 30 12:16:39 UTC 2022 - Alexei Sorokin + +- Update to version 1.215: + * See https://salsa.debian.org/installer-team/console-setup/-/blob/debian/1.215/debian/changelog +- Make a bdf2psf package like in Fedora. +- Suggest xkeyboard-config. +- Replace console-setup-1.76-paths.patch with + console-setup-paths.patch. +- Move the fonts to /usr/share/kbd/ to be discoverable by vconsole. +- Drop console-setup-1.134-perl526.patch, + console-setup-1.134-reproducible.patch, u_fix-iso-left-tab.patch, + 0001-ckbcomp-Fix-check-for-non-ascii.patch: fixed upstream. +- Fix the RPM Group. + ------------------------------------------------------------------- Mon Dec 12 09:54:28 UTC 2022 - Fabian Vogt diff --git a/console-setup.spec b/console-setup.spec index 0783525..d8beda0 100644 --- a/console-setup.spec +++ b/console-setup.spec @@ -17,67 +17,85 @@ Name: console-setup -Version: 1.134 +Version: 1.215 Release: 0 Summary: Tools for configuring the console using X Window System key maps License: GPL-2.0-or-later AND MIT AND SUSE-Public-Domain -Group: Applications/System -URL: http://packages.debian.org/cs/sid/console-setup -Source: http://ftp.de.debian.org/debian/pool/main/c/%{name}/%{name}_%{version}.tar.xz -# Fixes installing paths to Fedora style -Patch0: console-setup-1.76-paths.patch -# Fixes FSF address, sent to upstream -Patch1: console-setup-1.76-fsf-address.patch -# Backport fix from 1.143 -Patch2: console-setup-1.134-perl526.patch -# PATCH-FIX-UPSTREAM in 1.174 -Patch3: console-setup-1.134-reproducible.patch -# Fix Shift-Tab mapping (bsc#1122361) -Patch4: u_fix-iso-left-tab.patch -# Fix using Caps_Lock where possible (bsc#1202853). Sent upstream. -Patch5: 0001-ckbcomp-Fix-check-for-non-ascii.patch - +Group: System/Console +URL: https://salsa.debian.org/installer-team/console-setup +Source: https://deb.debian.org/debian/pool/main/c/%{name}/%{name}_%{version}.tar.xz +# PATCH-FIX-OPENSUSE console-setup-1.76-fsf-address.patch -- Fix the FSF address. +Patch0: console-setup-1.76-fsf-address.patch +# PATCH-FIX-OPENSUSE console-setup-paths.patch -- Change installing paths to SUSE-style. +Patch1: console-setup-paths.patch +# Directory ownership. +BuildRequires: kbd BuildRequires: perl BuildRequires: perl(encoding) -# require 'xkeyboard-config' to have X Window keyboard descriptions? +Suggests: xkeyboard-config BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -This package provides the console with the same keyboard configuration -scheme that X Window System has. Besides the keyboard, the package configures -also the font on the console. It includes a rich collection of fonts and -supports several languages that would be otherwise unsupported on the console -(such as Armenian, Georgian, Lao and Thai). +This package provides the console with the same keyboard +configuration scheme that X Window System has. +Besides the keyboard, the package also configures the font on the +console. It includes a rich collection of fonts and 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 -%patch0 -p1 -b .paths -%patch1 -p1 -b .fsf-address -%patch2 -p1 -b .perl526 -%patch3 -p1 -b .reproducible -%patch4 -p1 -b .shift-tab -%patch5 -p1 -b .nonascii +%autosetup -n %{name} -p1 + +cp -a debian/changelog ChangeLog +cp -a debian/copyright COPYING %build -make build-linux +%make_build build-linux %install -make prefix=$RPM_BUILD_ROOT install-linux +make prefix=%{buildroot}%{_prefix} install-linux # we don't want another set of keyboard descriptions, we want to use descriptions from # xkeyboard-config (require it?), so removing it # or maybe have these from tarball it in optional subpackage? -rm -rf $RPM_BUILD_ROOT/etc/console-setup +rm -r %{buildroot}%{_sysconfdir}/console-setup/ + +install -Dpm 0755 Fonts/bdf2psf %{buildroot}%{_bindir}/bdf2psf +install -Dpm 0644 man/bdf2psf.1 %{buildroot}%{_mandir}/man1/bdf2psf.1 + +mkdir -p %{buildroot}%{_datadir}/bdf2psf/ +cp -a Fonts/fontsets/ Fonts/*.equivalents Fonts/*.set \ + %{buildroot}%{_datadir}/bdf2psf/ %files -%defattr(-,root,root) -%doc README COPYRIGHT CHANGES copyright.fonts copyright.xkb Fonts/copyright -%{_bindir}/ckbcomp -%{_bindir}/setupcon +%license COPYING copyright.fonts copyright.xkb Fonts/copyright +%doc ChangeLog README %config(noreplace) %{_sysconfdir}/default/console-setup %config(noreplace) %{_sysconfdir}/default/keyboard -%{_datadir}/consolefonts -%{_datadir}/consoletrans -%{_mandir}/*/* +%{_bindir}/ckbcomp +%{_bindir}/setupcon +%{_datadir}/kbd/consolefonts/ +%{_datadir}/kbd/consoletrans/ +%{_mandir}/man1/setupcon.1%{?ext_man} +%{_mandir}/man1/ckbcomp.1%{?ext_man} +%{_mandir}/man5/keyboard.5%{?ext_man} +%{_mandir}/man5/console-setup.5%{?ext_man} + +%files -n bdf2psf +%{_bindir}/bdf2psf +%{_datadir}/bdf2psf/ +%{_mandir}/man1/bdf2psf.1%{?ext_man} %changelog diff --git a/console-setup_1.134.tar.xz b/console-setup_1.134.tar.xz deleted file mode 100644 index b43036d..0000000 --- a/console-setup_1.134.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74994a19968cc6c72a82e4cb52ed0aea46ec7f2ad61cb9b4eb51f88549d80c82 -size 1809944 diff --git a/console-setup_1.215.tar.xz b/console-setup_1.215.tar.xz new file mode 100644 index 0000000..a53e347 --- /dev/null +++ b/console-setup_1.215.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d04bcf1b514b5986fe47eb484e959cad99e1744faa29a5fc1b3d1ca0ef7b636b +size 1796436 diff --git a/u_fix-iso-left-tab.patch b/u_fix-iso-left-tab.patch deleted file mode 100644 index 91cffcb..0000000 --- a/u_fix-iso-left-tab.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Keyboard/ckbcomp b/Keyboard/ckbcomp -index b0df60695362ae2930c1f8f3a9e2035b416c4288..47ec9224bde6f7c1416c07095de96819d93de803 100755 ---- a/Keyboard/ckbcomp -+++ b/Keyboard/ckbcomp -@@ -2581,7 +2581,7 @@ if ($freebsd) { - 'any' => 'NoSymbol', # Is this recognised by X ? - 'VoidSymbol' => 'VoidSymbol', - 'voidsymbol' => 'VoidSymbol', # Is this recognised by X ? -- 'ISO_Left_Tab' => 'Tab', -+ 'ISO_Left_Tab' => 'Meta_Tab', - 'Clear' => 'VoidSymbol', - 'Pause' => 'Pause', - 'Scroll_Lock' => 'Scroll_Lock', -diff --git a/Keyboard/compose_translator b/Keyboard/compose_translator -index d478def19335cd6637fc63812fd2c111dff67983..3af492f771c16e220d61687fe356d780526d531d 100755 ---- a/Keyboard/compose_translator -+++ b/Keyboard/compose_translator -@@ -1827,7 +1827,7 @@ my %xkbsym_table = ( - 'any' => 'NoSymbol', # Is this recognised by X ? - 'VoidSymbol' => 'VoidSymbol', - 'voidsymbol' => 'VoidSymbol', # Is this recognised by X ? -- 'ISO_Left_Tab' => 'Tab', -+ 'ISO_Left_Tab' => 'Meta_Tab', - 'Clear' => 'VoidSymbol', - 'Pause' => 'Pause', - 'Scroll_Lock' => 'Scroll_Lock',