Hello community,
here is the log from the commit of package iputils for openSUSE:Factory checked
in at 2020-11-23 16:38:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/iputils (Old)
and /work/SRC/openSUSE:Factory/.iputils.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iputils"
Mon Nov 23 16:38:55 2020 rev:56 rq:849626 version:s20200821
Changes:
--------
--- /work/SRC/openSUSE:Factory/iputils/iputils.changes 2020-10-22
14:23:32.922818464 +0200
+++ /work/SRC/openSUSE:Factory/.iputils.new.5913/iputils.changes
2020-11-23 18:46:00.245090233 +0100
@@ -7,0 +8,5 @@
+Fri Oct 16 09:57:32 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ iputils.spec ++++++
--- /var/tmp/diff_new_pack.pkqgSo/_old 2020-11-23 18:46:00.985091002 +0100
+++ /var/tmp/diff_new_pack.pkqgSo/_new 2020-11-23 18:46:00.985091002 +0100
@@ -91,7 +91,7 @@
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcrarpd
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcrdisc
-#UsrMerge
+%if !0%{?usrmerged}
# We still have reverse dependencies using /sbin/* or /bin/*
# so keep these symlinks for now. They are slowly being fixed
# but lets not just break them yet.
@@ -104,7 +104,7 @@
ln -sf %{_bindir}/ping6 %{buildroot}/bin
ln -sf %{_bindir}/tracepath %{buildroot}/bin
ln -sf %{_bindir}/tracepath6 %{buildroot}/bin
-#EndUsrMerge
+%endif
%find_lang %{name}
@@ -148,7 +148,7 @@
%{_bindir}/tracepath6
%{_unitdir}/rdisc.service
-#UsrMerge
+%if !0%{?usrmerged}
/bin/arping
/bin/clockdiff
/bin/ping
@@ -156,22 +156,21 @@
/sbin/rdisc
/bin/tracepath
/bin/tracepath6
-#EndUsrMerge
+%endif
%{_mandir}/man8/arping.8%{?ext_man}
%{_mandir}/man8/clockdiff.8%{?ext_man}
%{_mandir}/man8/ping.8%{?ext_man}
%{_mandir}/man8/rdisc.8%{?ext_man}
%{_mandir}/man8/tracepath.8%{?ext_man}
%{_mandir}/man8/tracepath6.8%{?ext_man}
-#EndUsrMerge
%files -n rarpd
%{_sbindir}/rarpd
%{_unitdir}/rarpd@.service
%{_sbindir}/rcrarpd
-#UsrMerge
+%if !0%{?usrmerged}
/sbin/rarpd
-#EndUsrMerge
+%endif
%{_mandir}/man8/rarpd.8%{?ext_man}
%changelog
_______________________________________________
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
