- updated to 3.0, modules require Linux >= 4.15

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

diff --git a/xtables-addons.spec b/xtables-addons.spec
index 24692537e1dfcd787853ae6087ef5cce5b45f7ef..44bd7ba88d1ab0e9c61b4b89321438b187a33154 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+
 #
 #
 # 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,42 +16,27 @@
 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:2.6.20.2" ; 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     8
+%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.3
+Version:       3.0
 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: 7d942729c365a549513511061f74c3e3
+# Source0-md5: b37ed4d9c28cdcd5558c55934be8d051
 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}}
+%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:4.15.0}}
 BuildRequires: libtool
 BuildRequires: pkgconfig >= 0.9.0
 BuildRequires: rpmbuild(macros) >= 1.678
@@ -66,6 +46,8 @@ Requires:     iptables >= 1.4.5
 Obsoletes:     iptables-ipp2p
 BuildRoot:     %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
 
+%define                _duplicate_files_terminate_build        0
+
 %description
 xtables-addons is the proclaimed successor to patch-o-matic(-ng). It
 contains extensions that were not accepted in the main
@@ -93,10 +75,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.\
@@ -108,7 +88,6 @@ Moduły jądra dla rozszerzeń z pakietu xtables-addons.\
 %defattr(644,root,root,755)\
 # restricted permissions - may contain password\
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/xt_sysrq.conf\
-/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/iptable_rawpost.ko*\
 /lib/modules/%{_kernel_ver}/kernel/net/netfilter/compat_xtables.ko*\
 /lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_*.ko*\
 \
@@ -122,13 +101,12 @@ Moduły jądra dla rozszerzeń z pakietu xtables-addons.\
 %define build_kernel_pkg()\
 srcdir=${PWD:-$(pwd)}\
 %build_kernel_modules XA_ABSTOPSRCDIR=$srcdir -C extensions -m compat_xtables\
-%install_kernel_modules -D installed -m extensions/iptable_rawpost -d kernel/net/ipv4/netfilter\
 for drv in extensions/compat_xtables.ko extensions/{ACCOUNT/,pknock/,}xt_*.ko ; do\
 %install_kernel_modules -D installed -m ${drv%.ko} -d kernel/net/netfilter\
 done\
 %{nil}
 
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
 
 %prep
 %setup -q -n %{pname}-%{version}
@@ -137,7 +115,7 @@ done\
 %configure \
        --without-kbuild
 
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
 
 %if %{with userspace}
 %{__make} \