diff --git a/.gitignore b/.gitignore index 00fbc3a..fe738c5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ iproute2-2.6.35.tar.bz2 /iproute2-2.6.38.1.tar.bz2 /iproute2-2.6.39.tar.gz /iproute2-3.1.0.tar.bz2 +/iproute2-3.2.0.tar.bz2 diff --git a/iproute.spec b/iproute.spec index c9f33da..1b86b73 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,7 +1,7 @@ %global cbq_version v0.7.3 Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 3.1.0 +Version: 3.2.0 Release: 1%{?dist} Group: Applications/System URL: http://kernel.org/pub/linux/utils/networking/%{name}2/ @@ -180,6 +180,10 @@ done %{_includedir}/libnetlink.h %changelog +* Fri Jan 06 2012 Petr Šabata - 3.2.0-1 +- 3.2.0 bump +- Removing a useless, now conflicting patch (initcwnd already decumented) + * Thu Nov 24 2011 Petr Šabata - 3.1.0-1 - 3.1.0 bump - Point URL and Source to the new location on kernel.org diff --git a/man-pages.patch b/man-pages.patch index 6e88648..1592889 100644 --- a/man-pages.patch +++ b/man-pages.patch @@ -71,18 +71,6 @@ diff -up /dev/null iproute2-2.6.29/man/man8/nstat.8 @@ -0,0 +1 @@ +.so man8/rtacct.8 \ No newline at end of file -diff -up iproute2-2.6.29/iproute2-2.6.29/man/man8/ip.8.mm iproute2-2.6.29/iproute2-2.6.29/man/man8/ip.8 ---- iproute2-2.6.29/man/man8/ip.8.mm 2008-07-25 22:46:07.000000000 +0200 -+++ iproute2-2.6.29/man/man8/ip.8 2008-08-12 14:24:01.000000000 +0200 -@@ -190,6 +190,8 @@ replace " | " monitor " } " - .IR NUMBER " ] [ " - .B cwnd - .IR NUMBER " ] [ " -+.B initcwnd -+.IR NUMBER " ] [ " - .B ssthresh - .IR REALM " ] [ " - .B realms --- iproute2-2.6.35/man/man8/ss.8 2010-08-04 19:45:59.000000000 +0200 +++ iproute2-2.6.35/man/man8/ss.8.new 2010-10-11 14:47:06.084216018 +0200 @@ -114,7 +114,7 @@ diff --git a/sources b/sources index acf5deb..d2b05e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca1c899d147b4dd2caeb31316013344b iproute2-3.1.0.tar.bz2 +90913f781aa1b161bb23c70e3111552d iproute2-3.2.0.tar.bz2