Hello community,
here is the log from the commit of package procps for openSUSE:Factory checked
in at 2020-12-09 22:12:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/procps (Old)
and /work/SRC/openSUSE:Factory/.procps.new.2328 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "procps"
Wed Dec 9 22:12:07 2020 rev:117 rq:853759 version:3.3.16
Changes:
--------
--- /work/SRC/openSUSE:Factory/procps/procps.changes 2020-10-08
13:10:55.835104335 +0200
+++ /work/SRC/openSUSE:Factory/.procps.new.2328/procps.changes 2020-12-09
22:12:09.831112201 +0100
@@ -1,0 +2,5 @@
+Fri Oct 16 10:17:57 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ procps.spec ++++++
--- /var/tmp/diff_new_pack.6Y2bfz/_old 2020-12-09 22:12:10.587112967 +0100
+++ /var/tmp/diff_new_pack.6Y2bfz/_new 2020-12-09 22:12:10.587112967 +0100
@@ -18,7 +18,11 @@
%define somajor 8
%define libname libprocps%{somajor}
+%if !0%{?usrmerged}
%bcond_with bin2usr
+%else
+%bcond_without bin2usr
+%endif
%bcond_without pidof
Name: procps
Version: 3.3.16
@@ -238,10 +242,12 @@
ln snice skill
popd
fi
+%if !0%{?usrmerged}
ln -s %{_bindir}/ps %{buildroot}/bin/
ln -s %{_bindir}/pgrep %{buildroot}/bin/
ln -s %{_bindir}/pkill %{buildroot}/bin/
ln -s %{_sbindir}/sysctl %{buildroot}/sbin/
+%endif
%else
mv %{buildroot}%{_bindir}/ps %{buildroot}/bin/
mv %{buildroot}%{_bindir}/pgrep %{buildroot}/bin/
@@ -323,10 +329,12 @@
%license COPYING COPYING.LIB
%doc NEWS Documentation/bugs.md Documentation/FAQ
%if %{with bin2usr}
+%if !0%{?usrmerged}
%verify(link) /bin/ps
%verify(link) /bin/pgrep
%verify(link) /bin/pkill
%verify(link) /sbin/sysctl
+%endif
%{_bindir}/ps
%{_bindir}/pgrep
%{_bindir}/pkill
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
