- updated to 3.2 (targeted to Linux 4.18)

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

diff --git a/xtables-addons.spec b/xtables-addons.spec
index 56d2d22e13d889d3dc1bb12835aa9aa7c23ce1b1..eb5f028e3b60f0a6465f69bbcbec36fc30b46fe7 100644 (file)
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -1,6 +1,6 @@
 #
-# UPDATE WARNING: xtables-addons 2.0 support only kernels 3.7+
-#
+# UPDATE WARNING: xtables-addons 3.0 support only kernels 4.15+
+#                 xtables-addons 2.0 (XTADDONS_2 branch) support kernels 3.7 - 4.14
 #
 # Conditional build:
 %bcond_without kernel          # don't build kernel modules
@@ -16,48 +16,33 @@
 exit 1
 %endif
 
-%if "%{_alt_kernel}" != "%{nil}"
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%undefine      with_userspace
-%global                _build_kernels          %{alt_kernel}
-%else
-%global                _build_kernels          %{?build_kernels:,%{?build_kernels}}
-%endif
-
 %if %{without userspace}
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
 %endif
 
-%define                kbrs    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo "BuildRequires:kernel%%{_alt_kernel}-module-build >= 3:3.7.0" ; done)
-%define                kpkg    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
-%define                bkpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
-
 %define                rel     1
 %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:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:       2.5
+Version:       3.2
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       GPL v2
 Group:         Networking/Admin
 Source0:       http://downloads.sourceforge.net/xtables-addons/%{pname}-%{version}.tar.xz
-# Source0-md5: 335663ece5fb17c7d0bb24dbdc697eb1
+# Source0-md5: 80ea89ba8d5a001a8d71c7f05b2f0141
 URL:           http://xtables-addons.sourceforge.net/
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.11
-BuildRequires: iptables-devel >= 1.4.5
-%{?with_kernel:%{expand:%kbrs}}
+BuildRequires: iptables-devel >= 1.6.0
+%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:4.18.0}}
 BuildRequires: libtool
 BuildRequires: pkgconfig >= 0.9.0
 BuildRequires: rpmbuild(macros) >= 1.678
 BuildRequires: tar >= 1.22
 BuildRequires: xz
-Requires:      iptables >= 1.4.5
+Requires:      iptables >= 1.6.0
 Obsoletes:     iptables-ipp2p
 BuildRoot:     %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
 
@@ -121,7 +106,7 @@ for drv in extensions/compat_xtables.ko extensions/{ACCOUNT/,pknock/,}xt_*.ko ;
 done\
 %{nil}
 
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
 
 %prep
 %setup -q -n %{pname}-%{version}
@@ -130,7 +115,7 @@ done\
 %configure \
        --without-kbuild
 
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
 
 %if %{with userspace}
 %{__make} \