X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=ipset.spec;h=452d7d8a1191947a53416b299b535b4df3e67614;hb=04771e79382d241c8e43c236d9b6f61a2f21b4bf;hp=7b50d7074790df650f52a6aeaec5ad326fe3bcbb;hpb=ff01f2298cba38df81831c910f9489160311682f;p=packages%2Fipset.git

diff --git a/ipset.spec b/ipset.spec
index 7b50d70..452d7d8 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -20,28 +20,27 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	3
+%define		rel	17
 %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.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:	575a365d430023a578350ca5de787b84
+# Source0-md5:	9fd70c825f052db7dc9d5ba0562b7083
 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
 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
@@ -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,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
-%patch2 -p1
+%{!?with_kernel:%patch0 -p1}
 
 %build
 %{__libtoolize}
@@ -148,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}
@@ -173,11 +169,12 @@ install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{pname}
 %endif
 
 %if %{with kernel}
-cd kernel/net/netfilter
-%install_kernel_modules -m ipset/ip_set -d kernel/net/ipv4/netfilter/ipset
-install -p ipset/ip_set_*.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ipset
-install -p xt_*.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter
-cd -
+for drv in kernel/net/netfilter/ipset/ip_set*.ko ; do
+%install_kernel_modules -m ${drv%.ko} -d kernel/net/ipv4/netfilter/ipset
+done
+for drv in kernel/net/netfilter/xt_*.ko ; do
+%install_kernel_modules -m ${drv%.ko} -d kernel/net/ipv4/netfilter
+done
 %endif
 
 %clean
@@ -203,7 +200,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