Accepting request 1058140 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1058140
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=115

kbd.changes

@@ -5,6 +5,11 @@ Sat Dec 31 12:29:16 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
   'U+00b0' needs to be 'dead_abovering' and not 'dead_grave' as we
   assumed before
 
+-------------------------------------------------------------------
+Tue Dec 27 12:35:19 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Mon Aug  8 06:54:58 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
 

kbd.spec

@@ -286,7 +286,7 @@ install -m 644 %{SOURCE4} %{buildroot}%{_pam_vendordir}/vlock
 install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/vlock
 %endif
 install -m 644 %{SOURCE12} %{buildroot}%{_mandir}/man8/
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 mkdir -p %{buildroot}/bin
 mkdir -p %{buildroot}/sbin
 ln -s %{_bindir}/chvt %{buildroot}/bin
@@ -417,7 +417,7 @@ test -f /etc/pam.d/vlock.rpmsave && mv -v /etc/pam.d/vlock.rpmsave /etc/pam.d/vl
 %{_fillupdir}/sysconfig.keyboard
 %{kbd}
 %exclude %{kbd}/keymaps/{%{legacy_folders}}
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /sbin/fbtest
 /bin/chvt
 /bin/openvt