Accepting request 1055730 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1055730
OBS-URL: https://build.opensuse.org/package/show/network/rpcbind?expand=0&rev=97
This commit is contained in:
Petr Vorel 2023-01-04 16:33:42 +00:00 committed by Git OBS Bridge
parent 03eb056769
commit 0d1a54573b
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 13:16:20 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
-------------------------------------------------------------------
Mon Jun 21 15:44:17 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>

View File

@ -86,7 +86,7 @@ install -m 644 %{SOURCE5} %{buildroot}%{_sysusersdir}/
mkdir -p %{buildroot}/%{_sbindir}
ln -s service %{buildroot}%{_sbindir}/rc%{name}
ln -s %{_bindir}/rpcinfo %{buildroot}%{_sbindir}/rpcinfo
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
mkdir %{buildroot}/sbin
mkdir %{buildroot}/bin
ln -s %{_bindir}/rpcinfo %{buildroot}/sbin/rpcinfo
@ -110,7 +110,7 @@ ln -s %{_sbindir}/%{name} %{buildroot}/sbin/%{name}
%files
%license COPYING
%doc AUTHORS README
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
/sbin/%{name}
/bin/rpcinfo
/sbin/rpcinfo