- rebuild for kernel-3.5.5-1

[packages/ipset.git] / ipset.spec

diff --git a/ipset.spec b/ipset.spec
index 02ae3465deda8cd6e205fa8011b4f3ab2bad71a9..2a305acbb14e5aa9f06bc54706600af9d62be6a6 100644 (file)
--- a/ipset.spec
+++ b/ipset.spec
@@ -20,28 +20,29 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     1
+%define                rel     18
 %define                pname   ipset
 Summary:       IP sets utility
 Summary(pl.UTF-8):     Narzędzie do zarządzania zbiorami IP
 Name:          %{pname}%{_alt_kernel}
-Version:       6.5
+Version:       6.12.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: 9d334e3a6b696d461de6de27246fdec0
+# Source0-md5: 80df500a4d93cb14e1373ae290716cda
 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
 %{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.38.6}
-BuildRequires: libmnl-devel
-BuildRequires: libtool
+BuildRequires: libmnl-devel >= 1
+BuildRequires: libtool >= 2:2.0
 %{?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)
@@ -69,7 +70,7 @@ Summary:      Header files for ipset interface
 Summary(pl.UTF-8):     Pliki nagłówkowe do interfejsu ipset
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      libmnl-devel
+Requires:      libmnl-devel >= 1
 
 %description devel
 Header files for IPset interface.
@@ -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}
@@ -145,6 +143,7 @@ Ten pakiet zawiera moduły jądra oferujące wsparcie dla zbiorów IP.
 %{__autoheader}
 %{__automake}
 %configure \
+       --disable-silent-rules \
        --with-kbuild=%{_kernelsrcdir}
 
 %if %{with userspace}
@@ -200,7 +199,7 @@ fi
 %doc ChangeLog ChangeLog.ippool README UPGRADE
 %attr(755,root,root) %{_sbindir}/ipset
 %attr(755,root,root) %{_libdir}/libipset.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libipset.so.1
+%attr(755,root,root) %ghost %{_libdir}/libipset.so.2
 %{_mandir}/man8/ipset.8*
 
 %files devel