rpms/iproute/devel iproute2-2.6.31-tc_modules.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 iproute.spec, 1.103, 1.104 sources, 1.31, 1.32

[Marcela Mašláňová]

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27193

Modified Files:
	.cvsignore iproute.spec sources 
Added Files:
	iproute2-2.6.31-tc_modules.patch 
Log Message:
* Mon Jan  4 2010 Marcela Mašláňová <mmaslano at redhat.com> - 2.6.31-1
- update to 2.6.31


iproute2-2.6.31-tc_modules.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE iproute2-2.6.31-tc_modules.patch ---
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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	27 Nov 2009 10:20:11 -0000	1.31
+++ .cvsignore	4 Jan 2010 12:21:20 -0000	1.32
@@ -1 +1 @@
-iproute2-20091106.tar.bz2
+iproute2-2.6.31.tar.bz2


Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- iproute.spec	27 Nov 2009 13:45:57 -0000	1.103
+++ iproute.spec	4 Jan 2010 12:21:20 -0000	1.104
@@ -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 at redhat.com> - 2.6.31-1
+- update to 2.6.31
+
 * Fri Nov 27 2009 Marcela Mašláňová <mmaslano at redhat.com> - 2.6.29-5.1.20091106gita7a9ddbb
 - 539232 patch cbq initscript
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	27 Nov 2009 10:20:11 -0000	1.31
+++ sources	4 Jan 2010 12:21:20 -0000	1.32
@@ -1 +1 @@
-7fb86ac6828aa67f745e3246446b1885  iproute2-20091106.tar.bz2
+230f35282a95451622f3e8394f9cd80a  iproute2-2.6.31.tar.bz2