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

Accepting request 849614 from home:lnussel:usrmove

Browse Source 
- 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
This commit is contained in:
Jan Engelhardt 2020-11-20 10:10:54 +00:00 committed by Git OBS Bridge
parent e7d37b2972
commit be17df006d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
iproute2.changes
View File

@ -6,6 +6,11 @@ Sat Oct 17 11:23:47 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Drop 0001-ip-add-error-reporting-when-RTM_GETNSID-failed.patch - Drop 0001-ip-add-error-reporting-when-RTM_GETNSID-failed.patch
(merged) (merged)
-------------------------------------------------------------------
Fri Oct 16 09:56:50 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 23 21:57:45 UTC 2020 - Jan Engelhardt <jengelh@inai.de> Wed Sep 23 21:57:45 UTC 2020 - Jan Engelhardt <jengelh@inai.de>

8
iproute2.spec
View File

@ -121,11 +121,11 @@ install -pm0644 "lib/libnetlink.a" "$b/%_libdir/"
chmod -x "$b/%_libdir/libnetlink.a" chmod -x "$b/%_libdir/libnetlink.a"
install -pm0644 "include/libnetlink.h" "$b/%_includedir/" install -pm0644 "include/libnetlink.h" "$b/%_includedir/"
chmod -x "$b/%_includedir/libnetlink.h" chmod -x "$b/%_includedir/libnetlink.h"
#UsrMerge %if !0%{?usrmerged}
ln -s "%_sbindir/ip" "$b/sbin" ln -s "%_sbindir/ip" "$b/sbin"
mkdir -p "$b/bin" mkdir -p "$b/bin"
ln -sf "%_sbindir/ip" "$b/bin/ip" ln -sf "%_sbindir/ip" "$b/bin/ip"
#EndUsrMerge %endif
for BIN in lnstat nstat routef routel ss; do for BIN in lnstat nstat routef routel ss; do
ln -sf "%_sbindir/$BIN" "$b/%_bindir/$BIN" ln -sf "%_sbindir/$BIN" "$b/%_bindir/$BIN"
done done
@ -142,10 +142,10 @@ cp -an README* examples/bpf "$b/%_docdir/%name/"
%_bindir/ss %_bindir/ss
%_sbindir/* %_sbindir/*
%exclude %_sbindir/arpd %exclude %_sbindir/arpd
#UsrMerge %if !0%{?usrmerged}
/sbin/* /sbin/*
/bin/ip /bin/ip
#EndUsrMerge %endif
%_mandir/man7/* %_mandir/man7/*
%_mandir/man8/* %_mandir/man8/*
%exclude %_mandir/man8/arpd.8* %exclude %_mandir/man8/arpd.8*