X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxtables-addons.git;a=blobdiff_plain;f=xtables-addons.spec;h=6af4145b1829d843603b65c4b56473565d52993e;hp=742d2ab8cbdbdb974ce2471790b151985b3847cd;hb=0cbafbd719c7830cf67afcb67e02a37569df8882;hpb=13dd3c364c5e6709966296303b4ebe683c83090d

diff --git a/xtables-addons.spec b/xtables-addons.spec
index 742d2ab..6af4145 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,18 +16,18 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	1
+%define		rel	16
 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.37
+Version:	1.39
 Release:	%{rel}
 License:	GPL v2
 Group:		Networking/Admin
 Source0:	http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar.xz
-# Source0-md5:	bfb0adba948fa885fffa6443eeaee28a
+# Source0-md5:	63dedce9afd16acfd68efc30c9f55950
 URL:		http://xtables-addons.sourceforge.net/
-BuildRequires:	autoconf >= 2.50
+BuildRequires:	autoconf >= 2.65
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	iptables-devel >= 1.4.3
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.29}
@@ -36,6 +37,11 @@ BuildRequires:	rpmbuild(macros) >= 1.379
 BuildRequires:	tar >= 1.22
 BuildRequires:	xz
 Requires:	iptables >= 1.4.3
+%if %{with ipset}
+Provides:	ipset = 6.7
+Obsoletes:	ipset
+%endif
+Obsoletes:	iptables-ipp2p
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # use macro, so adapter won't try to wrap
@@ -78,7 +84,9 @@ Moduły jądra dla rozszerzeń z pakietu xtables-addons.
 %prep
 %setup -q
 
-%{__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}
@@ -123,11 +131,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,6 +162,12 @@ rm -rf $RPM_BUILD_ROOT
 %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}