Author: gotar Date: Sun Aug 29 16:02:01 2010 GMT Module: packages Tag: HEAD ---- Log message: - BR: tar >= 1.22, xz (.tar.xz Source0), strict am and pkgconfig versions - fixed --without userspace build (/etc/modprobe.d/xt_sysrq.conf), cleanup
---- Files affected: packages/xtables-addons: xtables-addons.spec (1.65 -> 1.66) ---- Diffs: ================================================================ Index: packages/xtables-addons/xtables-addons.spec diff -u packages/xtables-addons/xtables-addons.spec:1.65 packages/xtables-addons/xtables-addons.spec:1.66 --- packages/xtables-addons/xtables-addons.spec:1.65 Sun Aug 29 14:26:43 2010 +++ packages/xtables-addons/xtables-addons.spec Sun Aug 29 18:01:53 2010 @@ -36,12 +36,14 @@ 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) @@ -118,7 +120,7 @@ %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 @@ -135,10 +137,9 @@ # 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. @@ -148,12 +149,10 @@ #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 @@ -185,6 +184,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.66 2010/08/29 16:01:53 gotar +- BR: tar >= 1.22, xz (.tar.xz Source0), strict am and pkgconfig versions +- fixed --without userspace build (/etc/modprobe.d/xt_sysrq.conf), cleanup + Revision 1.65 2010/08/29 12:26:43 arekm - rel 7; drop libxt_TEE.so (provided by iptables) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/xtables-addons.spec?r1=1.65&r2=1.66&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
