X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=ipset.spec;h=488223cc869ab834a81a02bea57bdc29ae9f4490;hb=1f1cd72097ae6914ecae15521d9e2664636be927;hp=a0e16d3e02d6a9fb31380d0696b5770fd614cdf4;hpb=dded0e58c4663c85d03e27dd51038f1f2d80b4f6;p=packages%2Fipset.git

diff --git a/ipset.spec b/ipset.spec
index a0e16d3..488223c 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -20,27 +20,31 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	4
+%define		rel	6
 %define		pname	ipset
 Summary:	IP sets utility
 Summary(pl.UTF-8):	Narzędzie do zarządzania zbiorami IP
 Name:		%{pname}%{_alt_kernel}
-Version:	6.3
+Version:	6.11
 Release:	%{rel}
-License:	GPL
+License:	GPL v2
 Group:		Networking/Admin
+#Source0Download: http://ipset.netfilter.org/install.html
 Source0:	http://ipset.netfilter.org/%{pname}-%{version}.tar.bz2
-# Source0-md5:	8830f555133695d455a7aa5d7b5019ea
+# Source0-md5:	bfcc92e30a0fcf10ae6e7c4affa03c84
 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
+Patch2:		%{pname}-kernel-3.3.patch
+Patch3:		%{pname}-kernel-3.0.patch
 URL:		http://ipset.netfilter.org/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.34}
-BuildRequires:	libmnl-devel
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.38.6}
+BuildRequires:	libmnl-devel >= 1
 BuildRequires:	libtool
-%{?with_userspace:BuildRequires:	linux-libc-headers >= 7:2.6.34}
+%{?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)
@@ -67,6 +71,8 @@ zbioru.
 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 >= 1
 
 %description devel
 Header files for IPset interface.
@@ -129,11 +135,10 @@ 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
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -196,15 +201,15 @@ fi
 %defattr(644,root,root,755)
 %doc ChangeLog ChangeLog.ippool README UPGRADE
 %attr(755,root,root) %{_sbindir}/ipset
-%attr(755,root,root) %{_libdir}/libipset.so.1.*
-%attr(755,root,root) %ghost %{_libdir}/libipset.so.1
+%attr(755,root,root) %{_libdir}/libipset.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libipset.so.2
 %{_mandir}/man8/ipset.8*
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/libipset
-%{_libdir}/libipset.la
 %attr(755,root,root) %{_libdir}/libipset.so
+%{_libdir}/libipset.la
+%{_includedir}/libipset
 
 %files static
 %defattr(644,root,root,755)
@@ -219,6 +224,7 @@ fi
 %files -n kernel%{_alt_kernel}-net-ipset
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/xt_*.ko*
+%dir /lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ipset
 /lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ipset/ip_set.ko*
 /lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ipset/ip_set_*.ko*
 %endif