diff --git a/iproute2.changes b/iproute2.changes index dbf3ed9..9f0dee7 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -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 diff --git a/iproute2.spec b/iproute2.spec index c96ab82..4e06196 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -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/*