X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxtables-addons.git;a=blobdiff_plain;f=xtables-addons.spec;h=0daca8a8ebeb70b04038c5150717d788634a5d1c;hp=21218ca5d823dc1265a58008fd4b950f6915f777;hb=refs%2Fheads%2FXTADDONS_1;hpb=dc6622188b317d5187588abd0bc6c4183d4b11df

diff --git a/xtables-addons.spec b/xtables-addons.spec
index 21218ca..0daca8a 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -1,121 +1,145 @@
 #
+# 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
-
-%if %{without kernel}
-%undefine	with_dist_kernel
-%endif
-%if "%{_alt_kernel}" != "%{nil}"
-%undefine	with_userspace
+%bcond_with	verbose		# verbose build (V=1)
+
+# 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
+# with every kernel change.
+%if 0%{?_pld_builder:1} && %{with kernel} && %{with userspace}
+%{error:kernel and userspace cannot be built at the same time on PLD builders}
+exit 1
 %endif
+
 %if %{without userspace}
 # nothing to be placed to debuginfo package
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	7
+%define		rel	44
 %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}%{_alt_kernel}
-Version:	1.42
-Release:	%{rel}
+Name:		%{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
+Version:	1.47.1
+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:	7c996a0400667b57ab4fb53a013ae742
+# 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.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:	rpmbuild(macros) >= 1.701
+%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
 BuildRequires:	tar >= 1.22
 BuildRequires:	xz
 Requires:	iptables >= 1.4.5
+Provides:	xtables-addons = %{version}-%{release}
+Obsoletes:	xtables-addons < %{version}-%{release}
 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}
-
 %description
 xtables-addons is the proclaimed successor to patch-o-matic(-ng). It
 contains extensions that were not accepted in the main
 xtables/iptables package.
 
 For the tools to work, you should install kernel modules, which could
-be found in %{kpackage}.
+be found in kernel*-net-xtables-addons = %{version}-%{rel}.
 
 %description -l pl.UTF-8
 xtables-addons to następca patch-o-matic(-ng). Zawiera rozszerzenia,
 które nie zostały zaakceptowane do głównego pakietu xtables/iptables.
 
 Aby narzędzia działały należy zainstalować moduły jądra, które można
-znaleźć w pakiecie %{kpackage}.
-
-%package -n kernel%{_alt_kernel}-net-xtables-addons
-Summary:	Kernel modules for xtables addons
-Summary(pl.UTF-8):	Moudły jądra dla rozszerzeń z pakietu xtables-addons
-Release:	%{rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-# VERSION only dependency is intentional, for allowing multiple kernel pkgs and
-# single userspace package installs.
-Requires:	%{pname} = %{version}
-Suggests:	xtables-geoip
-Conflicts:	xtables-geoip < 20090901-2
-%{?with_dist_kernel:%requires_releq_kernel}
-Requires(post,postun):	/sbin/depmod
-
-%description -n kernel%{_alt_kernel}-net-xtables-addons
-Kernel modules for xtables addons.
-
-%description -n kernel%{_alt_kernel}-net-xtables-addons -l pl.UTF-8
-Moduły jądra dla rozszerzeń z pakietu xtables-addons.
+znaleźć w pakiecie kernel*-net-xtables-addons = %{version}-%{rel}.
+
+%define	kernel_pkg()\
+%package -n kernel%{_alt_kernel}-net-xtables-addons\
+Summary:	Kernel modules for xtables addons\
+Summary(pl.UTF-8):	Moudły jądra dla rozszerzeń z pakietu xtables-addons\
+Release:	%{rel}@%{_kernel_ver_str}\
+Group:		Base/Kernel\
+# VERSION only dependency is intentional, for allowing multiple kernel pkgs and\
+# single userspace package installs.\
+Requires:	%{pname} = %{version}\
+Suggests:	xtables-geoip\
+Conflicts:	xtables-geoip < 20090901-2\
+Requires(post,postun):	/sbin/depmod\
+%requires_releq_kernel\
+Requires(postun):	%releq_kernel\
+\
+%description -n kernel%{_alt_kernel}-net-xtables-addons\
+Kernel modules for xtables addons.\
+\
+%description -n kernel%{_alt_kernel}-net-xtables-addons -l pl.UTF-8\
+Moduły jądra dla rozszerzeń z pakietu xtables-addons.\
+\
+%files -n kernel%{_alt_kernel}-net-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*\
+\
+%post -n kernel%{_alt_kernel}-net-xtables-addons\
+%depmod %{_kernel_ver}\
+\
+%postun -n kernel%{_alt_kernel}-net-xtables-addons\
+%depmod %{_kernel_ver}\
+%{nil}
+
+%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:%create_kernel_packages}}
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
 %configure \
 	--without-kbuild
 
-%if %{with kernel}
-srcdir=${PWD:-$(pwd)}
-%build_kernel_modules V=1 XA_ABSTOPSRCDIR=$srcdir -C extensions -m compat_xtables
-%endif
-
 %if %{with userspace}
 %{__make} \
 	V=1
 %endif
 
+%{?with_kernel:%{expand:%build_kernel_packages}}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT{/etc/modprobe.d,/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter}
-cd extensions
-install iptable_rawpost.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter
-%install_kernel_modules -m compat_xtables -d kernel/net/netfilter
-install -p {ACCOUNT/,pknock/,}xt_*.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/netfilter
-cd ..
+install -d $RPM_BUILD_ROOT/etc/modprobe.d
+cp -a installed/* $RPM_BUILD_ROOT
 
 cat <<'EOF' > $RPM_BUILD_ROOT/etc/modprobe.d/xt_sysrq.conf
 # Set password at modprobe time. This file is secure if properly guarded,
 # i.e only readable by root.
 #options xt_SYSRQ password=cookies
 
-# The hash algorithm can also be specified as a module option, for example, to use SHA-256 instead of the default SHA-1:
+# The hash algorithm can also be specified as a module option, for example,
+# to use SHA-256 instead of the default SHA-1:
 #options xt_SYSRQ hash=sha256
 EOF
 %endif
@@ -135,12 +159,6 @@ rm -rf $RPM_BUILD_ROOT
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%post -n kernel%{_alt_kernel}-net-xtables-addons
-%depmod %{_kernel_ver}
-
-%postun -n kernel%{_alt_kernel}-net-xtables-addons
-%depmod %{_kernel_ver}
-
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -152,13 +170,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/iptaccount.8*
 %{_mandir}/man8/xtables-addons.8*
 %endif
-
-%if %{with kernel}
-%files -n kernel%{_alt_kernel}-net-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.gz
-/lib/modules/%{_kernel_ver}/kernel/net/netfilter/compat_xtables.ko.gz
-/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_*.ko.gz
-%endif