Sync from SUSE:SLFO:Main kbd revision daf05897a1514a81b9e9a8bfbe79d3a1

kbd.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 17 15:35:26 UTC 2024 - Stanislav Brabec <sbrabec@suse.com>
+
+- Move legacy keymaps that have no acceptable xkb counterpart and
+  its includes back to kbd. (bsc#1194609)
+
 -------------------------------------------------------------------
 Fri Dec 22 18:26:49 UTC 2023 - Antonio Teixeira <antonio.teixeira@suse.com>
 

kbd.spec

@@ -21,7 +21,7 @@
   %define _fillupdir /var/adm/fillup-templates
 %endif
 
-%define legacy_folders amiga,atari,i386,include,mac,ppc,sun
+%define legacy_folders amiga,atari,include,mac,pine,ppc,sun
 
 Name:           kbd
 Version:        2.6.4
@@ -79,13 +79,13 @@ BuildRequires:  pkgconfig
 BuildRequires:  suse-module-tools
 BuildRequires:  xkeyboard-config
 BuildRequires:  xz
-# Temporarily require -legacy
-Requires:       %{name}-legacy = %{version}-%{release}
 Requires(post): coreutils
 Requires(postun):coreutils
 Requires(pre):  %fillup_prereq
 Provides:       vlock = 2.2.3
 Obsoletes:      vlock <= 2.2.3
+# Keymaps moved from kbd-legacy to kbd (bsc#1194609) after SLE15 SP6, Leap 15.6 before ALP 1.0
+Conflicts:      kbd-legacy < %{version}
 
 %description
 Load and save keyboard mappings. This is needed if you are not using
@@ -399,7 +399,12 @@ test -f /etc/pam.d/vlock.rpmsave && mv -v /etc/pam.d/vlock.rpmsave /etc/pam.d/vl
 #doc CREDITS README
 %{_fillupdir}/sysconfig.console
 %{_fillupdir}/sysconfig.keyboard
-%{kbd}
+%dir %{kbd}
+%{kbd}/consolefonts
+%{kbd}/consoletrans
+%dir %{kbd}/keymaps
+%{kbd}/keymaps/xkb
+%{kbd}/unimaps
 %exclude %{kbd}/keymaps/{%{legacy_folders}}
 %if 0%{?suse_version} < 1550
 /sbin/fbtest
@@ -519,8 +524,31 @@ test -f /etc/pam.d/vlock.rpmsave && mv -v /etc/pam.d/vlock.rpmsave /etc/pam.d/vl
 %{_prefix}/lib/systemd/system/kbdsettings.service
 %{_datadir}/systemd/kbd-model-map.xkb-generated
 %{_sbindir}/kbdsettings
+# Move legacy keymaps that have no acceptable xkb counterpart to kbd. (bsc#1194609)
+%dir %{kbd}/keymaps/i386
+%dir %{kbd}/keymaps/i386/include
+%dir %{kbd}/keymaps/i386/qwerty
+%{kbd}/keymaps/i386/qwerty/gr.map.gz
+%{kbd}/keymaps/i386/qwerty/ruwin_alt-UTF-8.map.gz
+%{kbd}/keymaps/i386/qwerty/tj_alt-UTF8.map.gz
+%{kbd}/keymaps/i386/qwerty/ua-utf.map.gz
+%{kbd}/keymaps/i386/include/linux-keys-bare.inc
+%{kbd}/keymaps/i386/include/linux-with-alt-and-altgr.inc
+%{kbd}/keymaps/i386/include/compose.inc
+%{kbd}/keymaps/i386/include/qwerty-layout.inc
 
 %files legacy
-%{kbd}/keymaps/{%{legacy_folders}}
+%{kbd}/keymaps/{%{legacy_folders},i386}
+%exclude %dir %{kbd}/keymaps/i386
+%exclude %dir %{kbd}/keymaps/i386/include
+%exclude %dir %{kbd}/keymaps/i386/qwerty
+%exclude %{kbd}/keymaps/i386/qwerty/gr.map.gz
+%exclude %{kbd}/keymaps/i386/qwerty/ruwin_alt-UTF-8.map.gz
+%exclude %{kbd}/keymaps/i386/qwerty/tj_alt-UTF8.map.gz
+%exclude %{kbd}/keymaps/i386/qwerty/ua-utf.map.gz
+%exclude %{kbd}/keymaps/i386/include/linux-keys-bare.inc
+%exclude %{kbd}/keymaps/i386/include/linux-with-alt-and-altgr.inc
+%exclude %{kbd}/keymaps/i386/include/compose.inc
+%exclude %{kbd}/keymaps/i386/include/qwerty-layout.inc
 
 %changelog