- rebuild for kernel-3.7.10-2

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

diff --git a/xtables-addons.spec b/xtables-addons.spec
index 7950c17d38185fb52620ebee0e9dce9b5249cedf..7ca0a429e32663139d660a17496422155d664f8a 100644 (file)
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -1,9 +1,11 @@
 #
+# UPDATE WARNING: xtables-addons 2.0 support only kernels 3.7+
+#
+#
 # 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_with    ipset           # include IPSET (6.x)
 
 %if %{without kernel}
 %undefine      with_dist_kernel
@@ -16,33 +18,31 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     13
+%define                rel     14
+%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.39
+Name:          %{pname}%{_alt_kernel}
+Version:       1.47.1
 Release:       %{rel}
 License:       GPL v2
 Group:         Networking/Admin
-Source0:       http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar.xz
-# Source0-md5: 63dedce9afd16acfd68efc30c9f55950
+Source0:       http://downloads.sourceforge.net/xtables-addons/%{pname}-%{version}.tar.xz
+# Source0-md5: 92b9fc72980f9046622446d451296994
+Patch0:                %{pname}-DNETMAP.patch
 URL:           http://xtables-addons.sourceforge.net/
 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}
+BuildRequires: iptables-devel >= 1.4.5
+%{?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.3
-%if %{with ipset}
-Provides:      ipset = 6.7
-Obsoletes:     ipset
-%endif
+Requires:      iptables >= 1.4.5
 Obsoletes:     iptables-ipp2p
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+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}
@@ -69,7 +69,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}
@@ -82,11 +82,8 @@ Kernel modules for xtables addons.
 Moduły jądra dla rozszerzeń z pakietu xtables-addons.
 
 %prep
-%setup -q
-
-%if %{without ipset}
-%{__sed} -i -e 's#build_ipset6=m#build_ipset6=#' mconfig
-%endif
+%setup -q -n %{pname}-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -135,9 +132,6 @@ EOF
        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
@@ -162,12 +156,6 @@ 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}