Accepting request 440563 from home:jirislaby:branches:security:netfilter

- put lnstat nstat routef routel ss into /usr/bin so that users can
  actually run them

OBS-URL: https://build.opensuse.org/request/show/440563
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=127
This commit is contained in:
Jan Engelhardt 2016-11-16 08:57:24 +00:00 committed by Git OBS Bridge
parent 593bb6ee6e
commit 5643451b3e
2 changed files with 15 additions and 1 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Nov 16 08:29:11 UTC 2016 - jslaby@suse.com
- put lnstat nstat routef routel ss into /usr/bin so that users can
actually run them
-------------------------------------------------------------------
Mon Oct 17 08:58:54 UTC 2016 - jengelh@inai.de

View File

@ -100,7 +100,7 @@ make %{?_smp_mflags} LIBDIR="%_libdir" CCOPTS="-D_GNU_SOURCE %optflags -Wstrict-
%install
b="%buildroot"
install -d "$b"/{etc/,sbin/,usr/{sbin,share/man/man{3,8}}}
install -d "$b"/{etc/,sbin/,usr/{bin,sbin,share/man/man{3,8}}}
install -d "$b"/{/usr/include,%_libdir,/usr/share}
make install DESTDIR="$b" LIBDIR="%_libdir" \
MODDESTDIR="$b/%_libdir/tc" DOCDIR="%_docdir/%name"
@ -115,6 +115,9 @@ ln -s "%_sbindir/ip" "$b/sbin"
mkdir -p "$b/bin"
ln -sf "%_sbindir/ip" "$b/bin/ip"
#EndUsrMerge
for BIN in lnstat nstat routef routel ss; do
ln -sf "%{_sbindir}/$BIN" "$b%{_bindir}/$BIN"
done
rm "$b/%_sbindir/ifcfg"
mkdir -p "$b/%_docdir/%name"
@ -127,6 +130,11 @@ cp -an README* COPYING "$b/%_docdir/%name/"
%dir %_docdir/%name
%_docdir/%name/README*
%_docdir/%name/COPYING
%_bindir/lnstat
%_bindir/nstat
%_bindir/routef
%_bindir/routel
%_bindir/ss
%_sbindir/*
#UsrMerge
/sbin/*