Accepting request 321614 from home:sndirsch:fate318355

- /usr/share/systemd/kbd-model-map: added entries for
  xkeyboard-config converted keymaps; mappings, which already
  exist in original systemd mapping table are being ignored
  though, i.e. not overwritten; needs kbd in buildrequires
  (FATE#318426)

OBS-URL: https://build.opensuse.org/request/show/321614
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=889

systemd-mini.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug 10 13:16:54 UTC 2015 - sndirsch@suse.com
+
+- /usr/share/systemd/kbd-model-map: added entries for
+  xkeyboard-config converted keymaps; mappings, which already
+  exist in original systemd mapping table are being ignored
+  though, i.e. not overwritten; needs kbd in buildrequires
+  (FATE#318426)
+
 -------------------------------------------------------------------
 Wed Jul 29 18:10:53 UTC 2015 - meissner@suse.com
 

systemd.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug 10 13:16:54 UTC 2015 - sndirsch@suse.com
+
+- /usr/share/systemd/kbd-model-map: added entries for
+  xkeyboard-config converted keymaps; mappings, which already
+  exist in original systemd mapping table are being ignored
+  though, i.e. not overwritten; needs kbd in buildrequires
+  (FATE#318426)
+
 -------------------------------------------------------------------
 Wed Jul 29 18:10:53 UTC 2015 - meissner@suse.com
 

systemd.spec

@@ -58,6 +58,7 @@ BuildRequires:  automake
 BuildRequires:  fdupes
 BuildRequires:  gperf
 BuildRequires:  intltool
+BuildRequires:  kbd
 BuildRequires:  libacl-devel
 BuildRequires:  libcap-devel
 BuildRequires:  libsepol-devel
@@ -894,6 +895,12 @@ do
   ln -sf ../systemd-update-utmp-runlevel.service %{buildroot}%{_prefix}/lib/systemd/system/${runlevel}.target.wants/
 done
 
+# add entries for xkeyboard-config converted keymaps; mappings, 
+# which already exist in original systemd mapping table are being
+# ignored though, i.e. not overwritten
+cat /usr/share/systemd/kbd-model-map.xkb-generated \
+  >> %{buildroot}//usr/share/systemd/kbd-model-map
+
 %find_lang systemd
 
 %pre