packages: iptables/iptables.spec, iptables/iptables-account.patch (REMOVED)...

[arekm]

Author: arekm                        Date: Tue Oct 12 19:49:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- implement some Jan Engelhardt suggestions

---- Files affected:
packages/iptables:
   iptables.spec (1.283 -> 1.284) , iptables-account.patch (1.5 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/iptables/iptables.spec
diff -u packages/iptables/iptables.spec:1.283 packages/iptables/iptables.spec:1.284
--- packages/iptables/iptables.spec:1.283	Tue Sep 21 09:55:07 2010
+++ packages/iptables/iptables.spec	Tue Oct 12 21:48:57 2010
@@ -79,7 +79,7 @@
 Obsoletes:	iptables-ipp2p
 Obsoletes:	iptables24-compat
 Obsoletes:	netfilter
-Conflicts:	xtables-addons < 1.25
+Conflicts:	xtables-addons < 1.14
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -194,6 +194,7 @@
 %{__autoconf}
 %{__automake}
 %configure \
+	CFLAGS="%{rpmcflags} %{rpmcppflags} -D%{!?debug:N}DEBUG" \
 	--with-kbuild=%{_kernelsrcdir} \
 	--with-ksource=%{_kernelsrcdir} \
 	--enable-devel \
@@ -201,13 +202,7 @@
 	%{?with_static:--enable-static} \
 	--enable-shared
 
-%{__make} -j1 all \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} %{rpmcppflags} -D%{!?debug:N}DEBUG" \
-	KERNEL_DIR="%{_kernelsrcdir}" \
-	LIBDIR="%{_libdir}" \
-	DO_SELINUX=1 \
-	LDLIBS="-ldl"
+%{__make} V=1 all
 
 %if %{with doc}
 %{__make} -j1 -C iptables-howtos
@@ -292,7 +287,7 @@
 %attr(755,root,root) %{_libdir}/xtables/libipt_ecn.so
 %attr(755,root,root) %{_libdir}/xtables/libipt_ECN.so
 %attr(755,root,root) %{_libdir}/xtables/libipt_icmp.so
-%attr(755,root,root) %{_libdir}/xtables/libipt_ipv4options.so
+#%attr(755,root,root) %{_libdir}/xtables/libipt_ipv4options.so
 %attr(755,root,root) %{_libdir}/xtables/libipt_IPV4OPTSSTRIP.so
 %attr(755,root,root) %{_libdir}/xtables/libipt_layer7.so
 %attr(755,root,root) %{_libdir}/xtables/libipt_LOG.so
@@ -414,6 +409,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.284  2010/10/12 19:48:57  arekm
+- implement some Jan Engelhardt suggestions
+
 Revision 1.283  2010/09/21 07:55:07  arekm
 - ipt_account gone from kernel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/iptables.spec?r1=1.283&r2=1.284&f=u