Accepting request 1055712 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1055712
OBS-URL: https://build.opensuse.org/package/show/Base:System/mawk?expand=0&rev=29
This commit is contained in:
Dirk Mueller 2023-01-04 11:05:54 +00:00 committed by Git OBS Bridge
parent 16b2a0762b
commit d89dfc7935
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 13:10:01 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 23 14:03:54 UTC 2021 - Manfred Schwarb <manfred99@gmx.ch> Thu Sep 23 14:03:54 UTC 2021 - Manfred Schwarb <manfred99@gmx.ch>

View File

@ -54,7 +54,7 @@ chmod 755 examples/*
%install %install
%make_install %make_install
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
# compatibility symlink # compatibility symlink
install -d -m 755 %{buildroot}/bin install -d -m 755 %{buildroot}/bin
ln -s %{_bindir}/mawk %{buildroot}/bin/mawk ln -s %{_bindir}/mawk %{buildroot}/bin/mawk
@ -68,7 +68,7 @@ ln -s %{_bindir}/mawk %{buildroot}/bin/mawk
%doc ACKNOWLEDGMENT CHANGES README examples/ %doc ACKNOWLEDGMENT CHANGES README examples/
%{_bindir}/mawk %{_bindir}/mawk
%{_mandir}/man1/mawk.1%{?ext_man} %{_mandir}/man1/mawk.1%{?ext_man}
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
/bin/mawk /bin/mawk
%endif %endif