Accepting request 1284465 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1284465
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/console-setup?expand=0&rev=12

console-setup-1.237.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:161a138c163b753574b74f9aff718d9d5464a1da27edcbe782f8f85ebcb888d0
+size 2018980

console-setup-dejavu-fonts.patch

@@ -0,0 +1,34 @@
+Index: console-setup-1.237/Fonts/Makefile
+===================================================================
+--- console-setup-1.237.orig/Fonts/Makefile
++++ console-setup-1.237/Fonts/Makefile
+@@ -316,11 +316,11 @@ $./bdf/%-double.bdf :
+ 
+ dejavu_bdfs := $(foreach face, $(RASTERIZED_FACES), $./bdf/$($(face)-BDFS))
+ 
+-$./bdf/dejavu-u%b.bdf: /usr/share/fonts/truetype/dejavu/DejaVuSansMono-Bold.ttf
++$./bdf/dejavu-u%b.bdf: /usr/share/fonts/truetype/DejaVuSansMono-Bold.ttf
+ 	otf2bdf -c C -p $* -r 115 $< > $@ ; [ $$? = 8 ]
+ 	sed -i -e 's/^AVERAGE_WIDTH .*$$/AVERAGE_WIDTH $*0/' $@
+ 
+-$./bdf/dejavu-u%.bdf: /usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf
++$./bdf/dejavu-u%.bdf: /usr/share/fonts/truetype/DejaVuSansMono.ttf
+ 	otf2bdf -c C -p $* -r 115 $< > $@ ; [ $$? = 8 ]
+ 	sed -i -e 's/^AVERAGE_WIDTH .*$$/AVERAGE_WIDTH $*0/' $@
+ 
+@@ -438,14 +438,12 @@ $~clean:
+ 	cd $(fntdir) && \
+ 		rm -f *~ fontsets/*~ \
+ 			*.psf *.psf.gz *.sfm *.log *.raw *.fnt *.scm \
+-			terminfo termcap bdf/unifont.bdf $(dejavu_bdfs)
++			terminfo termcap $(dejavu_bdfs)
+ 
+ bdf .PHONY : $~bdf
+ $~bdf:
+ 	rm -f $(doubled_bdfs)
+ 	$(MAKE) $(doubled_bdfs)
+-	rm -f $(fntdir)/bdf/unifont.bdf
+-	$(MAKE) $(fntdir)/bdf/unifont.bdf
+ 	$(MAKE) $(dejavu_bdfs)
+ 
+ # The script 'fontcodesets' computes which codesets a font supports

console-setup-paths.patch

@@ -1,5 +1,7 @@
---- a/Keyboard/ckbcomp
+Index: console-setup-1.237/Keyboard/ckbcomp
-+++ b/Keyboard/ckbcomp
+===================================================================
+--- console-setup-1.237.orig/Keyboard/ckbcomp
++++ console-setup-1.237/Keyboard/ckbcomp
 @@ -3273,14 +3273,14 @@ if ($keycodes =~ /(^|\+|\|)ataritt(\([^\
  ########### READ ACM ###############################################
  
@@ -23,8 +25,10 @@
                       "${charmap}") {
  	if (-f $acmfile) {
  	    $acm = $acmfile;
---- a/Keyboard/compose_translator
+Index: console-setup-1.237/Keyboard/compose_translator
-+++ b/Keyboard/compose_translator
+===================================================================
+--- console-setup-1.237.orig/Keyboard/compose_translator
++++ console-setup-1.237/Keyboard/compose_translator
 @@ -51,10 +51,10 @@ my %uni2acm;
  my %acm2uni;
  if ($acm) {
@@ -40,8 +44,10 @@
  	if (-f $acmfile) {
  	    $acm = $acmfile;
  	    last;
---- a/Makefile
+Index: console-setup-1.237/Makefile
-+++ b/Makefile
+===================================================================
+--- console-setup-1.237.orig/Makefile
++++ console-setup-1.237/Makefile
 @@ -11,9 +11,9 @@ include Fonts/Makefile
  ~ := main
  
@@ -81,20 +87,9 @@
  	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
+@@ -78,10 +79,10 @@ install-mini-linux: install-common insta
- 	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
+ common-uninstall: | build-linux build-mini-linux
  	-for font in Fonts/*.psf.gz; do \
 -		rm $(prefix)/share/consolefonts/$${font##*/}; \
 +		rm $(prefix)/share/kbd/consolefonts/$${font##*/}; \
@@ -105,7 +100,7 @@
  	done
  	-for font in Fonts/*.fnt; do \
  		rm $(prefix)/share/syscons/fonts/$${font##*/}; \
-@@ -119,7 +120,7 @@ common-uninstall: | build-linux build-mi
+@@ -98,7 +99,7 @@ common-uninstall: | build-linux build-mi
  	-rm $(etcdir)/default/keyboard
  	-rm $(etcdir)/default/console-setup
  	-rm $(prefix)/bin/ckbcomp
@@ -114,8 +109,10 @@
  
  .PHONY: uninstall-linux
  uninstall-linux: build-linux common-uninstall
---- a/man/ckbcomp.1
+Index: console-setup-1.237/man/ckbcomp.1
-+++ b/man/ckbcomp.1
+===================================================================
+--- console-setup-1.237.orig/man/ckbcomp.1
++++ console-setup-1.237/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
@@ -149,9 +146,11 @@
  .br
  .I /usr/share/X11/xkb
  .br
---- a/man/console-setup.5
+Index: console-setup-1.237/man/console-setup.5
-+++ b/man/console-setup.5
+===================================================================
-@@ -403,16 +403,16 @@ Completely covered by the following font
+--- console-setup-1.237.orig/man/console-setup.5
++++ console-setup-1.237/man/console-setup.5
+@@ -404,16 +404,16 @@ Completely covered by the following font
  The standard location of the
  .B console-setup
  configuration file is
@@ -172,8 +171,10 @@
  
  .SH NOTES
  The aim of the Terminus font is to reduce the eyes-fatigue when one
---- a/man/keyboard.5
+Index: console-setup-1.237/man/keyboard.5
-+++ b/man/keyboard.5
+===================================================================
+--- console-setup-1.237.orig/man/keyboard.5
++++ console-setup-1.237/man/keyboard.5
 @@ -154,12 +154,12 @@ on FreeBSD.
  The standard location of the
  .B keyboard
@@ -190,8 +191,10 @@
  you will find several keymaps that can be used with the variable
  .BR KMAP .
  
---- a/man/setupcon.1
+Index: console-setup-1.237/man/setupcon.1
-+++ b/man/setupcon.1
+===================================================================
+--- console-setup-1.237.orig/man/setupcon.1
++++ console-setup-1.237/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
@@ -224,9 +227,11 @@
  .br
  .I /etc/console-setup/
  
---- a/setupcon
+Index: console-setup-1.237/setupcon
-+++ b/setupcon
+===================================================================
-@@ -644,9 +644,9 @@ esac
+--- console-setup-1.237.orig/setupcon
++++ console-setup-1.237/setupcon
+@@ -621,9 +621,9 @@ esac
  # mapdir, fontdir, stdfont, stdfontfallback
  case "$kernel" in
      linux)
@@ -238,7 +243,7 @@
          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
+@@ -672,7 +672,7 @@ fi
  # FONTMAPFILE
  FONTMAPFILE=''
  if [ "$kernel" = linux -a -n "$FONT_MAP" ]; then

console-setup.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Jun 10 12:23:56 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- console-setup-dejavu-fonts.patch
+  * generate also dejavu fonts
+- supersedes console-setup-no-dejavu-fonts.patch
+- buildrequire dejavu-fonts, otf2bdf (new package)
+
+-------------------------------------------------------------------
+Wed May 28 09:07:27 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- Updated to version 1.237
+  * updated translations
+- refreshed console-setup-paths.patch
+- unifont.tar.bz2: 
+  * package unifont.bdf since we don't have unifont.hex sources on
+    on our distribution
+- console-setup-no-dejavu-fonts.patch
+  * don't try to generate dejavu fonts (new feature)
+- switched to tarball format and name of main sources you can
+  actually download from the git webpage
+
 -------------------------------------------------------------------
 Sun Oct  1 11:32:44 UTC 2023 - Antonio Teixeira <antonio.teixeira@suse.com>
 

console-setup.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package console-setup
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,18 +17,26 @@
 
 
 Name:           console-setup
-Version:        1.223
+Version:        1.237
 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:          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
+# Download here: https://salsa.debian.org/installer-team/console-setup/-/tags
+Source:         %{name}/%{name}-%{version}.tar.bz2
+# unifont.bdf from git tree before it was removed
+Source1:        unifont.tar.bz2
 # 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
+Patch2:         console-setup-dejavu-fonts.patch
+BuildRequires:  bdfresize
+BuildRequires:  dejavu-fonts
+BuildRequires:  otf2bdf
 BuildRequires:  perl
+BuildRequires:  perl-XML-Parser
 BuildRequires:  perl(encoding)
 Suggests:       xkeyboard-config
 BuildArch:      noarch
@@ -55,7 +63,8 @@ glyph position in the console font is not wasted but used for
 another symbol.
 
 %prep
-%autosetup -p1
+%autosetup -a 1 -p1
+make maintainer-clean
 
 cp -a debian/changelog ChangeLog
 cp -a debian/copyright COPYING

unifont.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d5d406e005decf69498570e855fc2be5fc4f581bf6f8e038c60d41623f6b697
+size 40395