X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=ipset.spec;h=2b6c46f09e7e49be12942a0443b2a23d2e9a56b1;hb=0d2fc4308a552e44248173d7cf51726c09b15f0b;hp=371203112bfa1bc65aa46798bd893852a90dc788;hpb=bb29eb912256e08f55c6e52aaf0953cdbe479a56;p=packages%2Fipset.git

diff --git a/ipset.spec b/ipset.spec
index 3712031..2b6c46f 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -20,28 +20,27 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	9
+%define		rel	10
 %define		pname	ipset
 Summary:	IP sets utility
 Summary(pl.UTF-8):	Narzędzie do zarządzania zbiorami IP
 Name:		%{pname}%{_alt_kernel}
-Version:	6.9.1
+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:	71f4b826e025be5918a52e9843673167
+# Source0-md5:	80df500a4d93cb14e1373ae290716cda
 Source1:	%{pname}.init
-Patch0:		%{pname}-config_dist.patch
-Patch1:		%{pname}-no_kernel.patch
-Patch2:		%{pname}-hash-net-if-fix.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
@@ -71,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.
@@ -134,12 +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
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -148,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}
@@ -203,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