- rebuild for kernel-3.4.4-1

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

diff --git a/xtables-addons.spec b/xtables-addons.spec
index 277447e56031ffc628bdefad597f75ec6c691c98..2e5a6d5b2ef48020344fa71e878ea0db2ead6259 100644 (file)
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -2,7 +2,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_without userspace       # don't build userspace tools
 
 %if %{without kernel}
 %undefine      with_dist_kernel
@@ -15,29 +15,30 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     9
+%define                rel     12
+%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.35
+Name:          %{pname}%{_alt_kernel}
+Version:       1.42
 Release:       %{rel}
 License:       GPL v2
 Group:         Networking/Admin
-Source0:       http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar.xz
-# Source0-md5: c2d8c972182945c5535c90e33992250c
-Patch0:                kernelrelease.patch
+Source0:       http://downloads.sourceforge.net/xtables-addons/%{pname}-%{version}.tar.xz
+# Source0-md5: 7c996a0400667b57ab4fb53a013ae742
 URL:           http://xtables-addons.sourceforge.net/
-BuildRequires: autoconf >= 2.50
-BuildRequires: automake >= 1:1.10.2
-BuildRequires: iptables-devel >= 1.4.3
-%{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.25}
+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.32}
 BuildRequires: libtool
 BuildRequires: pkgconfig >= 0.9.0
 BuildRequires: rpmbuild(macros) >= 1.379
 BuildRequires: tar >= 1.22
 BuildRequires: xz
-Requires:      iptables >= 1.4.3
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Requires:      iptables >= 1.4.5
+Obsoletes:     iptables-ipp2p
+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}
@@ -64,7 +65,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}
@@ -77,10 +78,7 @@ Kernel modules for xtables addons.
 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
+%setup -q -n %{pname}-%{version}
 
 %build
 %{__libtoolize}
@@ -125,11 +123,10 @@ 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
 %endif
 
 %clean
@@ -152,6 +149,7 @@ 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*
 %endif