From 48890cc51a85fc9e257ff0c3c82c8d6315280b0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?=
 <mmaslano@fedoraproject.org>
Date: Mon, 4 Jan 2010 12:21:20 +0000
Subject: [PATCH] - update to 2.6.31

---
 .cvsignore                       |  2 +-
 iproute.spec                     | 17 ++++++++++-------
 iproute2-2.6.31-tc_modules.patch | 12 ++++++++++++
 sources                          |  2 +-
 4 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 iproute2-2.6.31-tc_modules.patch

diff --git a/.cvsignore b/.cvsignore
index abd5514..a226f7b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-iproute2-20091106.tar.bz2
+iproute2-2.6.31.tar.bz2
diff --git a/iproute.spec b/iproute.spec
index 61f9d15..c3ce6ab 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -1,20 +1,20 @@
-%define date_version 20091106
+#%define date_version 20091106
 %define cbq_version v0.7.3
 
 Summary: Advanced IP routing and network device configuration tools
 Name: iproute
-Version: 2.6.29
-Release: 5.1.%{date_version}gita7a9ddbb%{?dist}
+Version: 2.6.31
+Release: 1%{?dist}
 Group: Applications/System
-Source: iproute2-%{date_version}.tar.bz2
-#Source1: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
+##Source: iproute2-%{date_version}.tar.bz2
+Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
 URL:	http://linux-net.osdl.org/index.php/Iproute2
 Patch0: man-pages.patch
 Patch1: iproute2-2.6.29-kernel.patch
 Patch2: iproute2-ss050901-opt_flags.patch
 Patch3: iproute2-2.6.25-segfault.patch
 Patch4: iproute2-sharepath.patch
-Patch5: iproute2-2.6.29-tc_modules.patch
+Patch5: iproute2-2.6.31-tc_modules.patch
 Patch6: iproute2-2.6.29-IPPROTO_IP_for_SA.patch
 Patch7: iproute2-example-cbq-service.patch
 
@@ -39,7 +39,7 @@ License: GPLv2+
 The iproute documentation contains howtos and examples of settings.
 
 %prep
-%setup -q -n iproute2-%{date_version}
+%setup -q -n iproute2-%{version}
 %patch0 -p1
 %patch1 -p1 -b .kernel
 %patch2 -p1 -b .opt_flags
@@ -126,6 +126,9 @@ EOF
 %doc RELNOTES
 
 %changelog
+* Mon Jan  4 2010 Marcela Mašláňová <mmaslano@redhat.com> - 2.6.31-1
+- update to 2.6.31
+
 * Fri Nov 27 2009 Marcela Mašláňová <mmaslano@redhat.com> - 2.6.29-5.1.20091106gita7a9ddbb
 - 539232 patch cbq initscript
 
diff --git a/iproute2-2.6.31-tc_modules.patch b/iproute2-2.6.31-tc_modules.patch
new file mode 100644
index 0000000..0daa17b
--- /dev/null
+++ b/iproute2-2.6.31-tc_modules.patch
@@ -0,0 +1,12 @@
+diff -up iproute2-2.6.31/Makefile.old iproute2-2.6.31/Makefile
+--- iproute2-2.6.31/Makefile.old	2010-01-04 12:46:47.000000000 +0100
++++ iproute2-2.6.31/Makefile	2010-01-04 12:50:17.396384644 +0100
+@@ -13,7 +13,7 @@ DBM_INCLUDE:=$(ROOTDIR)/usr/include
+ 
+ SHARED_LIBS = y
+ 
+-DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
++DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\"
+ ifneq ($(SHARED_LIBS),y)
+ DEFINES+= -DNO_SHARED_LIBS
+ endif
diff --git a/sources b/sources
index d0d9c94..2b3f29a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7fb86ac6828aa67f745e3246446b1885  iproute2-20091106.tar.bz2
+230f35282a95451622f3e8394f9cd80a  iproute2-2.6.31.tar.bz2