diff --git a/systemd-v253.3+suse.22.g66f3a8a47d.tar.xz b/systemd-v253.3+suse.22.g66f3a8a47d.tar.xz deleted file mode 100644 index 27f4e3fe..00000000 --- a/systemd-v253.3+suse.22.g66f3a8a47d.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5e09e6e9eb4c0b383578dad276f56c174eacd2d7752e0f545db6d2480d627d0 -size 8205724 diff --git a/systemd-v253.3+suse.27.g3ce9610975.tar.xz b/systemd-v253.3+suse.27.g3ce9610975.tar.xz new file mode 100644 index 00000000..8a7621d8 --- /dev/null +++ b/systemd-v253.3+suse.27.g3ce9610975.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3f34496d7ed206b908455ec3c1a3794e94fe25ade2e06814e416744231446f2 +size 8207228 diff --git a/systemd.changes b/systemd.changes index 16ab984f..eaa530d0 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed May 3 06:20:28 UTC 2023 - Franck Bui + +- Import commit 3ce9610975b5239a21c0c886cb893bb172966de7 + + 3ce9610975 test: dont use anchor char '$' to match a part of a string + 03ede3eaa2 locale: when no xvariant match select the entry with an empty xvariant + f08017efd5 locale: convert generated vconsole keymap to x11 layout automatically + e8cf56459b localed-util: make use of strdupcspn() + 821c684440 test: use kbd-mode-map we ship in TEST-73-LOCALE + +- Mapping for converted keymaps is not needed anymore since their conversion to + their x11 layout counterpart is now done automatically by localed (commit + f08017efd5). + ------------------------------------------------------------------- Tue May 2 10:34:43 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 1b971cd7..9e050f26 100644 --- a/systemd.spec +++ b/systemd.spec @@ -19,7 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define archive_version +suse.22.g66f3a8a47d +%define archive_version +suse.27.g3ce9610975 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -925,20 +925,6 @@ install -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/suse.conf # consume those configs (like glibc or pam), see bsc#1170146. rm -fr %{buildroot}%{_datadir}/factory/* -# Add entries for xkeyboard-config converted keymaps; mappings, which -# already exist in original systemd mapping table are being ignored -# though, i.e. not overwritten; needed as long as YaST uses console -# keymaps internally and calls localectl to convert from vconsole to -# X11 keymaps. Ideally YaST should switch to X11 layout names (the -# mapping table wouldn't be needed since each X11 keymap has a -# generated xkbd keymap) and let localectl initialize -# /etc/vconsole.conf and /etc/X11/xorg.conf.d/00-keyboard.conf -# (FATE#319454). -if [ -f /usr/share/systemd/kbd-model-map.xkb-generated ]; then - cat /usr/share/systemd/kbd-model-map.xkb-generated \ - >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map -fi - # kbd-model-map.legacy is used to provide mapping for legacy keymaps, which may # still be used by yast. cat %{SOURCE14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map