From 9d806ccd8947e8cdb9c155b36d9faf1d4921d8fa6a41d62d08c2e75b0a431237 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 8 Mar 2012 16:59:23 +0000 Subject: [PATCH] Accepting request 108500 from home:rjschwei:branches:security:netfilter usrMerge project - move files from toplevel to /usr OBS-URL: https://build.opensuse.org/request/show/108500 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=44 --- iproute2.changes | 6 ++++++ iproute2.spec | 13 ++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/iproute2.changes b/iproute2.changes index 2292509..cde471c 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 8 16:45:03 UTC 2012 - rschweikert@suse.com + +- Place ip binary in /usr tree (UsrMerge project) +- Fix permissions to eliminate rpmlint errors + ------------------------------------------------------------------- Sat Jan 14 03:04:36 UTC 2012 - jengelh@medozas.de diff --git a/iproute2.spec b/iproute2.spec index 5f91321..9e26604 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -15,10 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: iproute2 -Provides: iproute = %version Version: 3.2.0 Release: 0 +Provides: iproute = %version Summary: Linux network configuration utilities License: GPL-2.0 Group: Productivity/Networking/Routing @@ -113,18 +114,24 @@ make install DESTDIR=%buildroot LIBDIR=%_libdir \ # We have m_xt rm -f "%buildroot/%_libdir/tc/m_ipt.so" install lib/libnetlink.a %buildroot/%_libdir +chmod -x %buildroot/%_libdir/libnetlink.a install include/libnetlink.h %buildroot%_includedir -mv %buildroot%_sbindir/ip %buildroot/sbin +chmod -x %buildroot%_includedir/libnetlink.h +#UsrMerge +ln -s %_sbindir/ip %buildroot/sbin mkdir -p %buildroot/bin -ln -sf /sbin/ip %buildroot/bin/ip +ln -sf %_sbindir/ip %buildroot/bin/ip +#EndUsrMerge rm %buildroot%_sbindir/ifcfg %files %defattr(-,root,root) %doc README* %_sbindir/* +#UsrMerge /sbin/* /bin/ip +#EndUsrMerge %_mandir/man7/* %_mandir/man8/* %dir %_sysconfdir/iproute2