pool/procps
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1055723 from home:lnussel:usrmerge

Browse Source 
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:
Dr. Werner Fink 2023-01-09 10:22:42 +00:00 committed by Git OBS Bridge
parent 2bc4b4cb95
commit 4d47787546
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
procps.changes
View File

@ -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>

6
procps.spec
View File

@ -18,7 +18,7 @@
%define somajor 8
%define libname libprocps%{somajor}
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
%bcond_with bin2usr
%else
%bcond_without bin2usr
@ -237,7 +237,7 @@ then
ln snice skill
popd
fi
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
ln -s %{_bindir}/ps %{buildroot}/bin/
ln -s %{_bindir}/pgrep %{buildroot}/bin/
ln -s %{_bindir}/pkill %{buildroot}/bin/
@ -333,7 +333,7 @@ test $error = no || exit 1
%license COPYING COPYING.LIB
%doc NEWS Documentation/bugs.md Documentation/FAQ
%if %{with bin2usr}
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
%verify(link) /bin/ps
%verify(link) /bin/pgrep
%verify(link) /bin/pkill