From bfca13633d995fb6b867e35256b27e48688c0685933c035fd705c83ad67014c1 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 4 Jan 2023 10:54:05 +0000 Subject: [PATCH] Accepting request 1054685 from home:lnussel:usrmerge Replace transitional %usrmerged macro with regular version check (boo#1206798) OBS-URL: https://build.opensuse.org/request/show/1054685 OBS-URL: https://build.opensuse.org/package/show/Base:System/initviocons?expand=0&rev=16 --- initviocons.changes | 5 +++++ initviocons.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/initviocons.changes b/initviocons.changes index b9b7a6c..ae85c7f 100644 --- a/initviocons.changes +++ b/initviocons.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 12:27:04 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Fri Oct 16 09:56:18 UTC 2020 - Ludwig Nussel diff --git a/initviocons.spec b/initviocons.spec index 58a0e91..5ee2ae3 100644 --- a/initviocons.spec +++ b/initviocons.spec @@ -1,7 +1,7 @@ # # spec file for package initviocons # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -54,7 +54,7 @@ make CFLAGS="$RPM_OPT_FLAGS -Wall" %install %make_install install -m 0755 termprobes $RPM_BUILD_ROOT/%{_bindir}/termprobes -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 mkdir -p $RPM_BUILD_ROOT/bin ln -sf %{_bindir}/initviocons $RPM_BUILD_ROOT/bin %endif @@ -62,7 +62,7 @@ ln -sf %{_bindir}/initviocons $RPM_BUILD_ROOT/bin %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 /bin/* %endif %{_bindir}/*