From a88a87aca86f72b1b5b4c579cfac19db4319bdad Mon Sep 17 00:00:00 2001 From: Tomasz Pala Date: Sun, 29 Aug 2010 16:01:53 +0000 Subject: [PATCH] - BR: tar >= 1.22, xz (.tar.xz Source0), strict am and pkgconfig versions - fixed --without userspace build (/etc/modprobe.d/xt_sysrq.conf), cleanup Changed files: xtables-addons.spec -> 1.66 --- xtables-addons.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/xtables-addons.spec b/xtables-addons.spec index 7e35393..107884a 100644 --- a/xtables-addons.spec +++ b/xtables-addons.spec @@ -35,12 +35,14 @@ Source0: http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar. URL: http://xtables-addons.sourceforge.net/ Patch0: kernelrelease.patch BuildRequires: autoconf -BuildRequires: automake +BuildRequires: automake >= 1.11 BuildRequires: iptables-devel >= 1.4.3 %{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.25} BuildRequires: libtool -BuildRequires: pkgconfig +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) @@ -117,7 +119,7 @@ srcdir=${PWD:-$(pwd)} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter,%{_mandir}/man8} +install -d $RPM_BUILD_ROOT{/etc/modprobe.d,/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter,%{_mandir}/man8} %if %{with kernel} cd extensions @@ -134,10 +136,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libxt_ACCOUNT_cl.{la,so} # provided by iptables rm -f $RPM_BUILD_ROOT%{_libdir}/xtables/libxt_TEE.so -install -d $RPM_BUILD_ROOT%{_mandir}/man8 cp -a xtables-addons.8 $RPM_BUILD_ROOT%{_mandir}/man8 +%endif -install -d $RPM_BUILD_ROOT/etc/modprobe.d cat <<'EOF' > $RPM_BUILD_ROOT/etc/modprobe.d/xt_sysrq.conf # Set password at modprobe time. if this file is secure if properly guarded, # i.e only readable by root. @@ -147,12 +148,10 @@ cat <<'EOF' > $RPM_BUILD_ROOT/etc/modprobe.d/xt_sysrq.conf #options xt_SYSRQ hash=sha256 EOF -%endif - %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post -p /sbin/ldconfig %postun -p /sbin/ldconfig %post -n kernel%{_alt_kernel}-net-xtables-addons -- 2.43.0