rpm/fillup
SHA256
1
0
Fork 0
forked from pool/fillup
Code Pull Requests Activity

Accepting request 1053873 from home:lnussel:usrmerge

Browse Source 
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
This commit is contained in:
Dirk Mueller 2023-01-13 07:39:15 +00:00 committed by Git OBS Bridge
parent df18d67fab
commit d8a170a8b4
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fillup.changes
View File

@ -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> Wed Aug 24 10:45:42 UTC 2022 - Andreas Schwab <schwab@suse.de>

6
fillup.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package fillup # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 -d %{buildroot}/%{_mandir}/man8
install -m 644 SGML/fillup.8.gz %{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) # 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) # So let's at least keep the symlink there for now (DimStar - 2014-10-31)
install -d -m 755 $RPM_BUILD_ROOT/bin install -d -m 755 $RPM_BUILD_ROOT/bin
@ -79,7 +79,7 @@ make test OPTISPLUS="%{optflags}"
%files %files
%defattr(-,root,root) %defattr(-,root,root)
# rpm scriptlets still use this, based on %*fillup* macros # rpm scriptlets still use this, based on %*fillup* macros
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
/bin/fillup /bin/fillup
%endif %endif
%{_bindir}/fillup %{_bindir}/fillup