Accepting request 1083516 from home:fcrozat:branches:Base:System

- Remove additional vfonts, they are freeware, not opensource
  (bsc#1210678).
- Adjust license tag, pinephone keymap is under GPL-3.0-or-later.

OBS-URL: https://build.opensuse.org/request/show/1083516
OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=159

kbd.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr 28 08:34:54 UTC 2023 - Frederic Crozat <fcrozat@suse.com>
+
+- Remove additional vfonts, they are freeware, not opensource
+  (bsc#1210678).
+- Adjust license tag, pinephone keymap is under GPL-3.0-or-later.
+
 -------------------------------------------------------------------
 Thu Apr 20 15:17:05 UTC 2023 - Franck Bui <fbui@suse.com>
 

kbd.spec

@@ -28,7 +28,7 @@ Version:        2.5.1
 Release:        0
 Summary:        Keyboard and Font Utilities
 # git: git://git.altlinux.org/people/legion/packages/kbd.git
-License:        GPL-2.0-or-later
+License:        GPL-2.0-or-later AND GPL-3.0-or-later
 Group:          System/Console
 URL:            http://kbd-project.org/
 # repack_kbd.sh on https://www.kernel.org/pub/linux/utils/kbd/kbd-%%{version}.tar.xz
@@ -165,14 +165,10 @@ DOC=%{buildroot}%{_defaultdocdir}/kbd
 KBD=%{kbd}
 K=%{buildroot}$KBD
 mkdir -p $K/consolefonts
-# First install the fonts from the vfont package
+# First install the fonts from the kbd_fonts directory
 # (allowing kbd to overwrite some of them)
 mkdir -p $DOC/fonts
 install -m 644 fonts/README $DOC/fonts/README.fonts
-install -m 644 fonts/vfont-4.36/README $DOC/fonts/README.vfont-4.36
-install -m 644 fonts/vfont-5.10/README $DOC/fonts/README.vfont-5.10
-install -m 644 fonts/vfont-5.10/SCRIPT $DOC/fonts/SCRIPT.vfont-5.10
-rm -f fonts/vfont-5.10/SCRIPT fonts/*/README
 install -m 644 fonts/*/* $K/consolefonts/
 # Now call kbd install
 echo "# Now call kbd install DESTDIR=%{buildroot} DATA_DIR=%{kbd} MAN_DIR=%{_mandir}"