- updated to 3.9.0

[packages/iproute2.git] / iproute2.spec

diff --git a/iproute2.spec b/iproute2.spec
index 8caa23b49e33fc8d9cfd6a04e1f8d6f795af9821..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.6.0
+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: a19e30c8e0099d3197414c96bea6d6f8
-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"}