- fix building with kernel 5.2

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

diff --git a/xtables-addons.spec b/xtables-addons.spec
index 8f00e6b32a56e8a3d69383544d9073093539df35..3b8714a39207d6a7105390932586f392487217a0 100644 (file)
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -1,17 +1,12 @@
 #
-# 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 dist_kernel     # without distribution kernel
 %bcond_without kernel          # don't build kernel modules
 %bcond_without userspace       # don't build userspace tools
 %bcond_with    verbose         # verbose build (V=1)
 
-%if %{without kernel}
-%undefine      with_dist_kernel
-%endif
-
 # The goal here is to have main, userspace, package built once with
 # simple release number, and only rebuild kernel packages with kernel
 # version as part of release number, without the need to bump release
@@ -21,48 +16,34 @@
 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                rel     2
 %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.3
 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: e99ea681b7b3866a581390e1b3ea185e
+Patch0:                kernel-5.2.patch
 URL:           http://xtables-addons.sourceforge.net/
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.11
-BuildRequires: iptables-devel >= 1.4.5
-%{?with_dist_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)
 
@@ -95,10 +76,8 @@ Requires:    %{pname} = %{version}\
 Suggests:      xtables-geoip\
 Conflicts:     xtables-geoip < 20090901-2\
 Requires(post,postun): /sbin/depmod\
-%if %{with dist_kernel}\
 %requires_releq_kernel\
 Requires(postun):      %releq_kernel\
-%endif\
 \
 %description -n kernel%{_alt_kernel}-net-xtables-addons\
 Kernel modules for xtables addons.\
@@ -128,16 +107,17 @@ 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}
+%patch0 -p1
 
 %build
 %configure \
        --without-kbuild
 
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
 
 %if %{with userspace}
 %{__make} \