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

@@ -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
 

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