commit 9b297650f62c5d9320028e40d83692e4f2a44b37
Author: Jakub Bogusz <[email protected]>
Date: Thu Dec 13 20:03:40 2012 +0100
- updated to 3.7.0
- removed obsolete build patch
iproute2-build.patch | 13 -------------
iproute2.spec | 29 +++++++++++++++--------------
2 files changed, 15 insertions(+), 27 deletions(-)
---
diff --git a/iproute2.spec b/iproute2.spec
index 8caa23b..8a1f406 100644
--- 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.7.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: bea92f26c8cc04e79f4db02dc1d258d3
+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
@@ -108,17 +107,19 @@ The iproute documentation contains howtos and examples of
settings.
Dokumentacja do iproute zawiera "howto" oraz przykłady ustawień.
%prep
-%setup -q
-#rm -rf include/linux
-%patch0 -p1
-%patch1 -p1
+%setup -q -n iproute-%{version}
+# 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
diff --git a/iproute2-build.patch b/iproute2-build.patch
deleted file mode 100644
index ebfd481..0000000
--- a/iproute2-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urNbB iproute2-2.6.14-051107.org/Makefile iproute2-2.6.14-051107/Makefile
---- iproute2-2.6.14-051107.org/Makefile 2005-07-09 00:08:47.000000000
+0200
-+++ iproute2-2.6.14-051107/Makefile 2005-11-10 16:04:15.024922750 +0100
-@@ -10,7 +10,7 @@
- DEFINES= -DRESOLVE_HOSTNAMES
-
- #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
--LDLIBS=-lresolv
-+LDLIBS=
- ADDLIB=
-
- #options for decnet
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iproute2.git/commitdiff/9b297650f62c5d9320028e40d83692e4f2a44b37
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
