Hello community, here is the log from the commit of package iproute2 for openSUSE:Factory checked in at 2020-11-23 16:38:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iproute2 (Old) and /work/SRC/openSUSE:Factory/.iproute2.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iproute2" Mon Nov 23 16:38:45 2020 rev:116 rq:849615 version:5.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/iproute2/iproute2.changes 2020-10-28 09:58:01.319129631 +0100 +++ /work/SRC/openSUSE:Factory/.iproute2.new.5913/iproute2.changes 2020-11-23 18:45:56.649086493 +0100 @@ -9,0 +10,5 @@ +Fri Oct 16 09:56:50 UTC 2020 - Ludwig Nussel <lnus...@suse.de> + +- prepare usrmerge (boo#1029961) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iproute2.spec ++++++ --- /var/tmp/diff_new_pack.Nh3nHv/_old 2020-11-23 18:45:57.269087138 +0100 +++ /var/tmp/diff_new_pack.Nh3nHv/_new 2020-11-23 18:45:57.269087138 +0100 @@ -121,11 +121,11 @@ chmod -x "$b/%_libdir/libnetlink.a" install -pm0644 "include/libnetlink.h" "$b/%_includedir/" chmod -x "$b/%_includedir/libnetlink.h" -#UsrMerge +%if !0%{?usrmerged} ln -s "%_sbindir/ip" "$b/sbin" mkdir -p "$b/bin" ln -sf "%_sbindir/ip" "$b/bin/ip" -#EndUsrMerge +%endif for BIN in lnstat nstat routef routel ss; do ln -sf "%_sbindir/$BIN" "$b/%_bindir/$BIN" done @@ -142,10 +142,10 @@ %_bindir/ss %_sbindir/* %exclude %_sbindir/arpd -#UsrMerge +%if !0%{?usrmerged} /sbin/* /bin/ip -#EndUsrMerge +%endif %_mandir/man7/* %_mandir/man8/* %exclude %_mandir/man8/arpd.8* _______________________________________________ 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