packages: xtables-addons/xtables-addons.spec - ipset has been finally dropp...

[qboosh]

Author: qboosh                       Date: Sat Apr  7 18:15:22 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ipset has been finally dropped from this package
- updated minimal kernel version

---- Files affected:
packages/xtables-addons:
   xtables-addons.spec (1.158 -> 1.159) 

---- Diffs:

================================================================
Index: packages/xtables-addons/xtables-addons.spec
diff -u packages/xtables-addons/xtables-addons.spec:1.158 packages/xtables-addons/xtables-addons.spec:1.159
--- packages/xtables-addons/xtables-addons.spec:1.158	Sat Apr  7 12:08:24 2012
+++ packages/xtables-addons/xtables-addons.spec	Sat Apr  7 20:15:17 2012
@@ -4,7 +4,6 @@
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
 %bcond_without	userspace	# don't build userspace tools
-%bcond_with	ipset		# include IPSET (6.x)
 
 %if %{without kernel}
 %undefine	with_dist_kernel
@@ -32,17 +31,13 @@
 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}
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.32}
 BuildRequires:	libtool
 BuildRequires:	pkgconfig >= 0.9.0
 BuildRequires:	rpmbuild(macros) >= 1.379
 BuildRequires:	tar >= 1.22
 BuildRequires:	xz
 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)
 
@@ -86,10 +81,6 @@
 %prep
 %setup -q -n %{pname}-%{version}
 
-%if %{without ipset}
-%{__sed} -i -e 's#build_ipset6=m#build_ipset6=#' mconfig
-%endif
-
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -137,9 +128,6 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libxt_ACCOUNT_cl.{la,so}
-%if %{with ipset}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libipset.{la,so}
-%endif
 %endif
 
 %clean
@@ -164,12 +152,6 @@
 %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}
@@ -188,6 +170,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.159  2012/04/07 18:15:17  qboosh
+- ipset has been finally dropped from this package
+- updated minimal kernel version
+
 Revision 1.158  2012/04/07 10:08:24  baggins
 - rel 3
 - fix prep
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/xtables-addons/xtables-addons.spec?r1=1.158&r2=1.159