From a62298413525dccb62987489b8a9919debb89a2b8cd7532fc066576eaa171eac Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 13 Jan 2023 07:40:23 +0000 Subject: [PATCH] Accepting request 1054912 from home:lnussel:usrmerge Replace transitional %usrmerged macro with regular version check (boo#1206798) OBS-URL: https://build.opensuse.org/request/show/1054912 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=154 --- kbd.changes | 5 +++++ kbd.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kbd.changes b/kbd.changes index b664b5d..4ca3d12 100644 --- a/kbd.changes +++ b/kbd.changes @@ -5,6 +5,11 @@ Sat Dec 31 12:29:16 UTC 2022 - Stefan Dirsch '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 + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Mon Aug 8 06:54:58 UTC 2022 - Thorsten Kukuk diff --git a/kbd.spec b/kbd.spec index 495fa81..ede549b 100644 --- a/kbd.spec +++ b/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