Accepting request 1055723 from home:lnussel:usrmerge
Replace transitional %usrmerged macro with regular version check (boo#1206798) OBS-URL: https://build.opensuse.org/request/show/1055723 OBS-URL: https://build.opensuse.org/package/show/Base:System/procps?expand=0&rev=241
This commit is contained in:
parent
2bc4b4cb95
commit
4d47787546
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 27 13:14:52 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
|
||||||
|
|
||||||
|
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Dec 15 09:45:46 UTC 2022 - Dr. Werner Fink <werner@suse.de>
|
Thu Dec 15 09:45:46 UTC 2022 - Dr. Werner Fink <werner@suse.de>
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
%define somajor 8
|
%define somajor 8
|
||||||
%define libname libprocps%{somajor}
|
%define libname libprocps%{somajor}
|
||||||
%if !0%{?usrmerged}
|
%if 0%{?suse_version} < 1550
|
||||||
%bcond_with bin2usr
|
%bcond_with bin2usr
|
||||||
%else
|
%else
|
||||||
%bcond_without bin2usr
|
%bcond_without bin2usr
|
||||||
@ -237,7 +237,7 @@ then
|
|||||||
ln snice skill
|
ln snice skill
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
%if !0%{?usrmerged}
|
%if 0%{?suse_version} < 1550
|
||||||
ln -s %{_bindir}/ps %{buildroot}/bin/
|
ln -s %{_bindir}/ps %{buildroot}/bin/
|
||||||
ln -s %{_bindir}/pgrep %{buildroot}/bin/
|
ln -s %{_bindir}/pgrep %{buildroot}/bin/
|
||||||
ln -s %{_bindir}/pkill %{buildroot}/bin/
|
ln -s %{_bindir}/pkill %{buildroot}/bin/
|
||||||
@ -333,7 +333,7 @@ test $error = no || exit 1
|
|||||||
%license COPYING COPYING.LIB
|
%license COPYING COPYING.LIB
|
||||||
%doc NEWS Documentation/bugs.md Documentation/FAQ
|
%doc NEWS Documentation/bugs.md Documentation/FAQ
|
||||||
%if %{with bin2usr}
|
%if %{with bin2usr}
|
||||||
%if !0%{?usrmerged}
|
%if 0%{?suse_version} < 1550
|
||||||
%verify(link) /bin/ps
|
%verify(link) /bin/ps
|
||||||
%verify(link) /bin/pgrep
|
%verify(link) /bin/pgrep
|
||||||
%verify(link) /bin/pkill
|
%verify(link) /bin/pkill
|
||||||
|
Loading…
Reference in New Issue
Block a user