From d8a170a8b4667d4261bce8f1c47f05d07ee44fd91fa2cc83100e89c6e52c376b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 13 Jan 2023 07:39:15 +0000 Subject: [PATCH] Accepting request 1053873 from home:lnussel:usrmerge Replace transitional %usrmerged macro with regular version check (boo#1206798) OBS-URL: https://build.opensuse.org/request/show/1053873 OBS-URL: https://build.opensuse.org/package/show/Base:System/fillup?expand=0&rev=34 --- fillup.changes | 5 +++++ fillup.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fillup.changes b/fillup.changes index 53161a1..3958402 100644 --- a/fillup.changes +++ b/fillup.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 10:36:20 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Wed Aug 24 10:45:42 UTC 2022 - Andreas Schwab diff --git a/fillup.spec b/fillup.spec index 55af816..ca09b9c 100644 --- a/fillup.spec +++ b/fillup.spec @@ -1,7 +1,7 @@ # # spec file for package fillup # -# Copyright (c) 2022 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 @@ -65,7 +65,7 @@ install -m 755 BIN/fillup %{buildroot}/%{_bindir} install -d %{buildroot}/%{_mandir}/man8 install -m 644 SGML/fillup.8.gz %{buildroot}/%{_mandir}/man8 -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 # There are literally hundreds of rpm scritps referencing /bin/fillup (suse macro) # So let's at least keep the symlink there for now (DimStar - 2014-10-31) install -d -m 755 $RPM_BUILD_ROOT/bin @@ -79,7 +79,7 @@ make test OPTISPLUS="%{optflags}" %files %defattr(-,root,root) # rpm scriptlets still use this, based on %*fillup* macros -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 /bin/fillup %endif %{_bindir}/fillup