- release 20

[packages/ipset.git] / ipset.spec

diff --git a/ipset.spec b/ipset.spec
index 4de46f6e05279b9e6e9a4c35619f3c1d810c295b..50a541f1ee3c0e09de6597b4986439e5bc55f920 100644 (file)
--- a/ipset.spec
+++ b/ipset.spec
@@ -20,21 +20,21 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     1
+%define                rel     20
 %define                pname   ipset
 Summary:       IP sets utility
 Summary(pl.UTF-8):     Narzędzie do zarządzania zbiorami IP
 Name:          %{pname}%{_alt_kernel}
-Version:       6.8
+Version:       6.9.1
 Release:       %{rel}
 License:       GPL v2
 Group:         Networking/Admin
 #Source0Download: http://ipset.netfilter.org/install.html
 Source0:       http://ipset.netfilter.org/%{pname}-%{version}.tar.bz2
-# Source0-md5: 575a365d430023a578350ca5de787b84
+# Source0-md5: 71f4b826e025be5918a52e9843673167
 Source1:       %{pname}.init
-Patch0:                %{pname}-config_dist.patch
-Patch1:                %{pname}-no_kernel.patch
+Patch0:                %{pname}-no_kernel.patch
+Patch1:                %{pname}-hash-net-if-fix.patch
 URL:           http://ipset.netfilter.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -42,6 +42,7 @@ BuildRequires:        automake
 BuildRequires: libmnl-devel
 BuildRequires: libtool
 %{?with_userspace:BuildRequires:       linux-libc-headers >= 7:2.6.38.6}
+BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.583
 Suggests:      kernel-net-ipset
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -132,11 +133,8 @@ Ten pakiet zawiera moduły jądra oferujące wsparcie dla zbiorów IP.
 
 %prep
 %setup -q -n %{pname}-%{version}
-%if %{with kernel}
-%{?with_dist_kernel:%patch0 -p1}
-%else
+%{!?with_kernel:%patch0 -p1}
 %patch1 -p1
-%endif
 
 %build
 %{__libtoolize}