From be17df006d3a24d506770d2d19aa38393460d058be5a403af0e03f85037fb72b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 20 Nov 2020 10:10:54 +0000 Subject: [PATCH] Accepting request 849614 from home:lnussel:usrmove - prepare usrmerge (boo#1029961) OBS-URL: https://build.opensuse.org/request/show/849614 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=205 --- iproute2.changes | 5 +++++ iproute2.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/iproute2.changes b/iproute2.changes index 44ec11f..baabc1f 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -6,6 +6,11 @@ Sat Oct 17 11:23:47 UTC 2020 - Jan Engelhardt - Drop 0001-ip-add-error-reporting-when-RTM_GETNSID-failed.patch (merged) +------------------------------------------------------------------- +Fri Oct 16 09:56:50 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Wed Sep 23 21:57:45 UTC 2020 - Jan Engelhardt diff --git a/iproute2.spec b/iproute2.spec index 45ff056..d4b4715 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -121,11 +121,11 @@ install -pm0644 "lib/libnetlink.a" "$b/%_libdir/" 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 @@ cp -an README* examples/bpf "$b/%_docdir/%name/" %_bindir/ss %_sbindir/* %exclude %_sbindir/arpd -#UsrMerge +%if !0%{?usrmerged} /sbin/* /bin/ip -#EndUsrMerge +%endif %_mandir/man7/* %_mandir/man8/* %exclude %_mandir/man8/arpd.8*