[ipset] New upstream release

[Mathieu Bridon]

commit 71acab3ca115b9ec200e440188181f6878e26f08
Author: Mathieu Bridon <bochecha at fedoraproject.org>
Date:   Mon Feb 6 17:10:09 2012 +0800

    New upstream release

 .gitignore                                         |    1 +
 ...onally-disable-building-the-kernel-module.patch |  107 --------------------
 ipset.spec                                         |   20 ++--
 sources                                            |    2 +-
 4 files changed, 12 insertions(+), 118 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7bbcfe9..69f6e26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ipset-6.9.1.tar.bz2
+/ipset-6.11.tar.bz2
diff --git a/ipset.spec b/ipset.spec
index 80f2ff5..7840d9e 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -1,6 +1,6 @@
 Name:          ipset
-Version:       6.9.1
-Release:       3%{?dist}
+Version:       6.11
+Release:       1%{?dist}
 Summary:       Manage Linux IP sets
 
 Group:         Applications/System
@@ -8,10 +8,6 @@ License:       GPLv2
 URL:           http://ipset.netfilter.org/
 Source0:       http://ipset.netfilter.org/%{name}-%{version}.tar.bz2
 
-# Submitted upstream: http://bugzilla.netfilter.org/show_bug.cgi?id=749
-Patch0:        ipset-6.9.1-Optionally-disable-building-the-kernel-module.patch
-
-BuildRequires: autoconf automake libtool
 BuildRequires: libmnl-devel
 
 # This is developped hand in hand with a kernel module
@@ -46,14 +42,12 @@ libraries.
 
 %prep
 %setup -q
-%patch0 -p1
 
 # Just to make absolutely sure we are not building the bundled kernel module
 rm -fr kernel
 
 
 %build
-autoreconf -i
 %configure --enable-static=no --with-kmod=no
 
 # Prevent libtool from defining rpath
@@ -78,15 +72,21 @@ find %{buildroot} -name '*.la' -exec rm -f '{}' \;
 %doc COPYING ChangeLog
 %doc %{_mandir}/man8/%{name}.8.gz
 %{_sbindir}/%{name}
-%{_libdir}/lib%{name}.so.1
-%{_libdir}/lib%{name}.so.1.0.0
+%{_libdir}/lib%{name}.so.2
+%{_libdir}/lib%{name}.so.2.0.0
 
 %files devel
 %doc COPYING
+%{_includedir}/lib%{name}
 %{_libdir}/lib%{name}.so
 
 
 %changelog
+* Mon Feb 06 2012 Mathieu Bridon <bochecha at fedoraproject.org> - 6.11-1
+- New upstream release.
+- Removed our patch, it has been integrated upstream. As such, we also don't
+  need to re-run autoreconf any more.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.9.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 8aee47f..49512a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-71f4b826e025be5918a52e9843673167  ipset-6.9.1.tar.bz2
+bfcc92e30a0fcf10ae6e7c4affa03c84  ipset-6.11.tar.bz2