diff --git a/iproute.spec b/iproute.spec index f5d47b6..0770e9f 100644 --- a/iproute.spec +++ b/iproute.spec @@ -30,6 +30,8 @@ BuildRequires: tex(latex) tex(dvips) linuxdoc-tools BuildRequires: flex linux-atm-libs-devel psutils db4-devel bison BuildRequires: iptables-devel >= 1.4.5 Requires: iptables >= 1.4.5 +Conflicts: filesystem < 3 +Provides: /sbin/ip %description The iproute package contains networking utilities (ip and rtmon, for example) @@ -74,15 +76,14 @@ sed -i "s/_VERSION_/%{version}/" man/man8/ss.8 %patch15 -p1 -b .arpd-usage %build -export LIBDIR=/%{_libdir} -export IPT_LIB_DIR=/%{_lib}/xtables +export LIBDIR=%{_libdir} +export IPT_LIB_DIR=%{_libdir}/xtables ./configure make %{?_smp_mflags} make -C doc %install mkdir -p \ - %{buildroot}/sbin \ %{buildroot}%{_includedir} \ %{buildroot}%{_sbindir} \ %{buildroot}%{_mandir}/man3 \ @@ -92,7 +93,7 @@ mkdir -p \ %{buildroot}%{_sysconfdir}/iproute2 \ %{buildroot}%{_sysconfdir}/sysconfig/cbq -# /sbin +# /usr/sbin for binary in \ examples/cbq.init-%{cbq_version} \ ip/ifcfg \ @@ -100,13 +101,7 @@ for binary in \ ip/routef \ ip/routel \ ip/rtpr \ - tc/tc - do install -m755 ${binary} %{buildroot}/sbin -done -mv %{buildroot}/sbin/cbq.init-%{cbq_version} %{buildroot}/sbin/cbq - -# /usr/sbin -for binary in \ + tc/tc \ genl/genl \ misc/arpd \ misc/ifstat \ @@ -116,6 +111,7 @@ for binary in \ misc/ss do install -m755 ${binary} %{buildroot}%{_sbindir} done +mv %{buildroot}/%{_sbindir}/cbq.init-%{cbq_version} %{buildroot}/%{_sbindir}/cbq cd %{buildroot}%{_sbindir} ln -s lnstat ctstat ln -s lnstat rtstat @@ -167,7 +163,6 @@ done %dir %{_sysconfdir}/iproute2 %doc COPYING %doc README README.decnet README.iproute2+tc README.distribution README.lnstat -/sbin/* %{_mandir}/man8/* %attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/* %{_sbindir}/*