Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package console-setup for openSUSE:Factory checked in at 2023-01-02 15:01:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/console-setup (Old) and /work/SRC/openSUSE:Factory/.console-setup.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "console-setup" Mon Jan 2 15:01:37 2023 rev:8 rq:1045985 version:1.215 Changes: -------- --- /work/SRC/openSUSE:Factory/console-setup/console-setup.changes 2022-12-21 16:06:08.054390645 +0100 +++ /work/SRC/openSUSE:Factory/.console-setup.new.1563/console-setup.changes 2023-01-02 15:01:38.945175849 +0100 @@ -1,0 +2,21 @@ +Sun Jan 1 10:13:39 UTC 2023 - Stefan Dirsch <sndir...@suse.com> + +- removed buildrequires to kbd to resolve kbd/console-setup build + cycle + +------------------------------------------------------------------- +Fri Dec 30 12:16:39 UTC 2022 - Alexei Sorokin <sor.ale...@meowr.ru> + +- 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. + +------------------------------------------------------------------- Old: ---- 0001-ckbcomp-Fix-check-for-non-ascii.patch console-setup-1.134-perl526.patch console-setup-1.134-reproducible.patch console-setup-1.76-paths.patch console-setup_1.134.tar.xz u_fix-iso-left-tab.patch New: ---- console-setup-paths.patch console-setup_1.215.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ console-setup.spec ++++++ --- /var/tmp/diff_new_pack.BxhMro/_old 2023-01-02 15:01:40.197182885 +0100 +++ /var/tmp/diff_new_pack.BxhMro/_new 2023-01-02 15:01:40.201182907 +0100 @@ -1,7 +1,7 @@ # # spec file for package console-setup # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,67 +17,84 @@ 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 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 +%dir %{_datadir}/kbd +%{_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 ++++++ console-setup-paths.patch ++++++ --- 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 ++++++ console-setup_1.134.tar.xz -> console-setup_1.215.tar.xz ++++++ ++++ 490873 lines of diff (skipped)
