- release 22

[packages/xtables-addons.git] / xtables-addons.spec

diff --git a/xtables-addons.spec b/xtables-addons.spec
index 9760a61318010b8f09de816b4276e35139a5206b..18512f1d507c654c69e0f273986efbe3120a1c88 100644 (file)
--- 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,28 +16,32 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     5
+%define                rel     22
 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.32
+Version:       1.39
 Release:       %{rel}
 License:       GPL v2
 Group:         Networking/Admin
 Source0:       http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar.xz
-# Source0-md5: 978a04e3e532ef0414ae1dd6a405304d
-Patch0:                kernelrelease.patch
+# Source0-md5: 63dedce9afd16acfd68efc30c9f55950
 URL:           http://xtables-addons.sourceforge.net/
-BuildRequires: autoconf >= 2.50
-BuildRequires: automake >= 1:1.10.2
+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.25}
+%{?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
+%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,9 +83,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 +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,7 +160,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}