Accepting request 1057026 from Base:System

Replace transitional %usrmerged macro with regular version check (boo#1206798) (forwarded request 1055724 from lnussel)

OBS-URL: https://build.opensuse.org/request/show/1057026
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/psmisc?expand=0&rev=85
This commit is contained in:
Dominique Leuenberger 2023-01-10 13:59:14 +00:00 committed by Git OBS Bridge
commit 5f70fad843
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 13:15:30 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
-------------------------------------------------------------------
Tue Dec 13 08:01:33 UTC 2022 - Dr. Werner Fink <werner@suse.de>

View File

@ -83,7 +83,7 @@ make check
%install
make DESTDIR=%{buildroot} install
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
mkdir -p %{buildroot}/bin/
ln -sf %{_bindir}/fuser %{buildroot}/bin/
%endif
@ -95,7 +95,7 @@ rm -f %{buildroot}%{_mandir}/man1/peekfd.1*
%files
%defattr (-,root,root,755)
%license COPYING
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
/bin/fuser
%endif
%{_bindir}/fuser