Accepting request 1058139 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1058139
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fillup?expand=0&rev=30

fillup.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 10:36:20 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Wed Aug 24 10:45:42 UTC 2022 - Andreas Schwab <schwab@suse.de>
 

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