X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxtables-addons.git;a=blobdiff_plain;f=xtables-addons.spec;h=894f113f9e120cad7e8dac2c919f9b99c196b4a9;hp=620b1f04cfd33ea2a906256cc311a5e2f94b0f07;hb=e0de918a8ec7e3e20f0b083d7a9990a5b8dd0c38;hpb=7144ba83ddf00fbae7b26715edfac611a43682cc

diff --git a/xtables-addons.spec b/xtables-addons.spec
index 620b1f0..894f113 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -2,7 +2,8 @@
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
-%bcond_without	userspace	# # don't build userspace tools
+%bcond_without	userspace	# don't build userspace tools
+%bcond_with	ipset		# include IPSET (6.x)
 
 %if %{without kernel}
 %undefine	with_dist_kernel
@@ -15,29 +16,34 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	6
+%define		rel	2
+%define		pname	xtables-addons
 Summary:	Additional extensions for xtables packet filtering system
 Summary(pl.UTF-8):	Dodatkowe rozszerzenia do systemu filtrowania pakietów xtables
-Name:		xtables-addons
-Version:	1.33
+Name:		%{pname}%{_alt_kernel}
+Version:	1.42
 Release:	%{rel}
 License:	GPL v2
 Group:		Networking/Admin
-Source0:	http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar.xz
-# Source0-md5:	db80618d505bf7a5b9d576d83e3f0f80
-Patch0:		kernelrelease.patch
+Source0:	http://downloads.sourceforge.net/xtables-addons/%{pname}-%{version}.tar.xz
+# Source0-md5:	7c996a0400667b57ab4fb53a013ae742
 URL:		http://xtables-addons.sourceforge.net/
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake >= 1:1.10.2
-BuildRequires:	iptables-devel >= 1.4.3
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.25}
+BuildRequires:	autoconf >= 2.65
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	iptables-devel >= 1.4.5
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.29}
 BuildRequires:	libtool
 BuildRequires:	pkgconfig >= 0.9.0
 BuildRequires:	rpmbuild(macros) >= 1.379
 BuildRequires:	tar >= 1.22
 BuildRequires:	xz
-Requires:	iptables >= 1.4.3
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Requires:	iptables >= 1.4.5
+%if %{with ipset}
+Provides:	ipset = 6.7
+Obsoletes:	ipset
+%endif
+Obsoletes:	iptables-ipp2p
+BuildRoot:	%{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
 
 # use macro, so adapter won't try to wrap
 %define		kpackage	kernel%{_alt_kernel}-net-xtables-addons = %{version}-%{rel}@%{_kernel_ver_str}
@@ -64,7 +70,7 @@ Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 # VERSION only dependency is intentional, for allowing multiple kernel pkgs and
 # single userspace package installs.
-Requires:	%{name} = %{version}
+Requires:	%{pname} = %{version}
 Suggests:	xtables-geoip
 Conflicts:	xtables-geoip < 20090901-2
 %{?with_dist_kernel:%requires_releq_kernel}
@@ -78,9 +84,10 @@ Moduły jądra dla rozszerzeń z pakietu xtables-addons.
 
 %prep
 %setup -q
-%patch0 -p1
 
-%{__sed} -i -e 's#build_ipset4=m#build_ipset4=#' mconfig
+%if %{without ipset}
+%{__sed} -i -e 's#build_ipset6=m#build_ipset6=#' mconfig
+%endif
 
 %build
 %{__libtoolize}
@@ -125,11 +132,13 @@ EOF
 %if %{with userspace}
 %{__make} -C extensions install \
 	DESTDIR=$RPM_BUILD_ROOT
+%{__make} install-man \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libxt_ACCOUNT_cl.{la,so}
-
-install -d $RPM_BUILD_ROOT%{_mandir}/man8
-cp -a xtables-addons.8 $RPM_BUILD_ROOT%{_mandir}/man8
+%if %{with ipset}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libipset.{la,so}
+%endif
 %endif
 
 %clean
@@ -152,7 +161,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libxt_ACCOUNT_cl.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libxt_ACCOUNT_cl.so.0
 %attr(755,root,root) %{_libdir}/xtables/libxt_*.so
+%{_mandir}/man8/iptaccount.8*
 %{_mandir}/man8/xtables-addons.8*
+%if %{with ipset}
+%attr(755,root,root) %{_sbindir}/ipset
+%attr(755,root,root) %{_libdir}/libipset.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libipset.so.1
+%{_mandir}/man8/ipset.8*
+%endif
 %endif
 
 %if %{with kernel}