X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=ipset.spec;h=d0f104797a2a53e5a2fb63aa9da2d3ca3e5a793e;hb=a719bd64ffeb08f8cf7c6442e2c253bdd88b6036;hp=c73980bfc26e0d866283fca127545d435cc3b78a;hpb=7184a423c9acac61cc976257fa5d9d81b4199b61;p=packages%2Fipset.git

diff --git a/ipset.spec b/ipset.spec
index c73980b..d0f1047 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -20,28 +20,29 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	2
+%define		rel	14
 %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.16.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:	9fd70c825f052db7dc9d5ba0562b7083
 Source1:	%{pname}.init
-Patch0:		%{pname}-config_dist.patch
-Patch1:		%{pname}-no_kernel.patch
+Patch0:		%{pname}-no_kernel.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:	libltdl-devel
+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,7 @@ 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
-%patch1 -p1
-%endif
+%{!?with_kernel:%patch0 -p1}
 
 %build
 %{__libtoolize}
@@ -145,6 +142,8 @@ Ten pakiet zawiera moduły jądra oferujące wsparcie dla zbiorów IP.
 %{__autoheader}
 %{__automake}
 %configure \
+	--disable-silent-rules \
+	-with-settype-modules-list=all \
 	--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.3
 %{_mandir}/man8/ipset.8*
 
 %files devel