Accepting request 1055737 from home:lnussel:usrmerge

Replace transitional %usrmerged macro with regular version check (boo#1206798)

OBS-URL: https://build.opensuse.org/request/show/1055737
OBS-URL: https://build.opensuse.org/package/show/Base:System/sed?expand=0&rev=50
This commit is contained in:
Dirk Mueller 2023-01-05 07:51:10 +00:00 committed by Git OBS Bridge
parent 65e982badc
commit 5e43cb6922
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 13:20:23 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 7 18:49:22 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de> Mon Nov 7 18:49:22 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>

View File

@ -51,7 +51,7 @@ export LDFLAGS="-pie"
%install %install
%make_install %make_install
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
mkdir -p %{buildroot}/bin mkdir -p %{buildroot}/bin
ln -s %{_bindir}/sed %{buildroot}/bin/sed ln -s %{_bindir}/sed %{buildroot}/bin/sed
%endif %endif
@ -63,7 +63,7 @@ ln -s %{_bindir}/sed %{buildroot}/bin/sed
%files %files
%license COPYING* %license COPYING*
%doc AUTHORS BUGS NEWS README* THANKS %doc AUTHORS BUGS NEWS README* THANKS
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
/bin/sed /bin/sed
%endif %endif
%{_bindir}/sed %{_bindir}/sed