- updated to 3.9.0

[packages/iproute2.git] / iproute2.spec

diff --git a/iproute2.spec b/iproute2.spec
index 060091f68f664d5146e9c235d827effaaf6c6483..153ded5c1a786cd714b92bf36a2c6a836818e8bc 100644 (file)
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -15,17 +15,16 @@ Summary(es.UTF-8):  Herramientas para encaminamiento avanzado y configuración de
 Summary(pl.UTF-8):     Narzędzie do konfigurowania sieci
 Summary(pt_BR.UTF-8):  Ferramentas para roteamento avançado e configuração de interfaces de rede
 Name:          iproute2
-Version:       3.5.1
+Version:       3.9.0
 Release:       1
 License:       GPL v2+
 Group:         Networking/Admin
 Source0:       http://kernel.org/pub/linux/utils/net/iproute2/%{name}-%{version}.tar.xz
-# Source0-md5: d4425b44edd5eacd6099e672e4baacbf
-Patch0:                %{name}-build.patch
-Patch1:                %{name}-arp.patch
-Patch3:                %{name}-iptables.patch
-Patch4:                %{name}-iptables64.patch
-Patch5:                %{name}-LDFLAGS.patch
+# Source0-md5: fd9db28e4f411a1e74de65c919ae590f
+Patch0:                %{name}-arp.patch
+Patch1:                %{name}-iptables.patch
+Patch2:                %{name}-iptables64.patch
+Patch3:                %{name}-LDFLAGS.patch
 # extensions
 Patch10:       %{name}-2.2.4-wrr.patch
 Patch11:       esfq-%{name}.patch
@@ -33,6 +32,7 @@ Patch12:      001-net-dev-iface-descr-0.1.diff
 Patch13:       %{name}-q_atm_c.patch
 Patch14:       %{name}-q_srr.v0.4.patch
 Patch15:       %{name}-ip_route_get.patch
+Patch16:       %{name}-build.patch
 URL:           http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
 BuildRequires: bison
 BuildRequires: db-devel
@@ -109,16 +109,18 @@ Dokumentacja do iproute zawiera "howto" oraz przykłady ustawień.
 
 %prep
 %setup -q
-#rm -rf include/linux
-%patch0 -p1
-%patch1 -p1
 
+# conflict with atm-vbr patched linux-libc-headers
+%{__rm} include/linux/atm.h
+#%{__rm} -r include/linux
+
+%patch0 -p1
 %if "%{_lib}" == "lib64"
-%patch4 -p1
+%patch2 -p1
 %else
-%patch3 -p1
+%patch1 -p1
 %endif
-%patch5 -p1
+%patch3 -p1
 
 # extensions:
 %patch10 -p1
@@ -127,6 +129,7 @@ Dokumentacja do iproute zawiera "howto" oraz przykłady ustawień.
 %patch13 -p0
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 %{__make} \
@@ -138,7 +141,7 @@ Dokumentacja do iproute zawiera "howto" oraz przykłady ustawień.
        LD="%{__cc}" \
 %endif
        HOSTCC="%{__cc}" \
-       CCOPTS="%{rpmcflags} %{rpmcppflags}" \
+       CCOPTS="%{rpmcflags} %{rpmcppflags} -Wno-unused-result" \
        LDFLAGS="%{rpmldflags} -Wl,-export-dynamic" \
        LIBDIR=%{_libdir} \
        %{!?with_tc:SUBDIRS="lib ip misc"}
@@ -150,53 +153,53 @@ Dokumentacja do iproute zawiera "howto" oraz przykłady ustawień.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir},%{_mandir}/man{3,7,8},%{_libdir},%{_includedir},%{?with_tc:%{_libdir}/tc}}
-
-install -p ip/{ip,rtmon,routel} %{?with_tc:tc/tc} misc/{ifstat,lnstat,nstat,rtacct,ss} $RPM_BUILD_ROOT%{_sbindir}
-ln -s lnstat $RPM_BUILD_ROOT%{_sbindir}/ctstat
-ln -s lnstat $RPM_BUILD_ROOT%{_sbindir}/rtstat
-cp -a etc/iproute2/rt_protos \
-       etc/iproute2/rt_realms \
-       etc/iproute2/rt_scopes \
-       etc/iproute2/rt_tables \
-       $RPM_BUILD_ROOT%{_sysconfdir}
-
-cp -a man/man3/*       $RPM_BUILD_ROOT%{_mandir}/man3
-cp -a man/man7/*       $RPM_BUILD_ROOT%{_mandir}/man7
-cp -a man/man8/*       $RPM_BUILD_ROOT%{_mandir}/man8
-echo ".so lnstat.8" > $RPM_BUILD_ROOT%{_mandir}/man8/ctstat.8
-echo ".so lnstat.8" > $RPM_BUILD_ROOT%{_mandir}/man8/rtstat.8
-echo ".so tc-pbfifo.8" > $RPM_BUILD_ROOT%{_mandir}/man8/tc-bfifo.8
-echo ".so tc-pbfifo.8" > $RPM_BUILD_ROOT%{_mandir}/man8/tc-pfifo.8
+install -d $RPM_BUILD_ROOT%{_includedir}
+
+%{__make} install \
+       LIBDIR=%{_libdir} \
+       DESTDIR=$RPM_BUILD_ROOT
+
+# omitted by make install
+install -Dp man/man7/tc-hfsc.7 $RPM_BUILD_ROOT%{_mandir}/man7/tc-hfsc.7
+
 # arpd is not packaged here
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/arpd.8
+%{__rm} $RPM_BUILD_ROOT%{_sbindir}/arpd $RPM_BUILD_ROOT%{_mandir}/man8/arpd.8
 
 cp -a lib/libnetlink.a $RPM_BUILD_ROOT%{_libdir}
 cp -a include/libnetlink.h $RPM_BUILD_ROOT%{_includedir}
-%{?with_tc:install -p tc/*.so $RPM_BUILD_ROOT%{_libdir}/tc}
 
 %if %{with doc}
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 %endif
 
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/iproute2
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc README README.decnet README.iproute2+tc README.distribution README.lnstat
+%attr(755,root,root) %{_sbindir}/bridge
 %attr(755,root,root) %{_sbindir}/ctstat
+%attr(755,root,root) %{_sbindir}/genl
+%attr(755,root,root) %{_sbindir}/ifcfg
 %attr(755,root,root) %{_sbindir}/ifstat
 %attr(755,root,root) %{_sbindir}/ip
 %attr(755,root,root) %{_sbindir}/lnstat
 %attr(755,root,root) %{_sbindir}/nstat
+%attr(755,root,root) %{_sbindir}/routef
 %attr(755,root,root) %{_sbindir}/routel
 %attr(755,root,root) %{_sbindir}/rtacct
 %attr(755,root,root) %{_sbindir}/rtmon
+%attr(755,root,root) %{_sbindir}/rtpr
 %attr(755,root,root) %{_sbindir}/rtstat
 %attr(755,root,root) %{_sbindir}/ss
 %dir %{_sysconfdir}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ematch_map
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/group
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rt_dsfield
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rt_protos
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rt_realms
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rt_scopes
@@ -217,6 +220,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/tc
 %dir %{_libdir}/tc
 %attr(755,root,root) %{_libdir}/tc/*.so
+%{_libdir}/tc/*.dist
 %{_mandir}/man7/tc-hfsc.7*
 %{_mandir}/man8/tc.8*
 %{_mandir}/man8/tc-*.8*