packages: xtables-addons/xtables-addons.spec - don't include ipset by defau...

[qboosh]

Author: qboosh                       Date: Sun Sep 11 11:18:46 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't include ipset by default, separate package is older

---- Files affected:
packages/xtables-addons:
   xtables-addons.spec (1.118 -> 1.119) 

---- Diffs:

================================================================
Index: packages/xtables-addons/xtables-addons.spec
diff -u packages/xtables-addons/xtables-addons.spec:1.118 packages/xtables-addons/xtables-addons.spec:1.119
--- packages/xtables-addons/xtables-addons.spec:1.118	Sat Sep 10 23:29:09 2011
+++ packages/xtables-addons/xtables-addons.spec	Sun Sep 11 13:18:41 2011
@@ -3,7 +3,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
@@ -38,7 +39,10 @@
 BuildRequires:	tar >= 1.22
 BuildRequires:	xz
 Requires:	iptables >= 1.4.3
+%if %{with ipset}
+Provides:	ipset = 6.7
 Obsoletes:	ipset
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # use macro, so adapter won't try to wrap
@@ -82,7 +86,9 @@
 %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}
@@ -127,11 +133,13 @@
 %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
@@ -155,10 +163,13 @@
 %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
-%attr(755,root,root) %{_libdir}/libipset.so.*
-%{_mandir}/man8/ipset.8*
 %{_mandir}/man8/iptaccount.8*
 %{_mandir}/man8/xtables-addons.8*
+%if %{with 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}
@@ -177,6 +188,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.119  2011/09/11 11:18:41  qboosh
+- don't include ipset by default, separate package is older
+
 Revision 1.118  2011/09/10 21:29:09  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/xtables-addons.spec?r1=1.118&r2=1.119&f=u