SPECS: kernel-vanilla.spec - netfilter config merged to multiarch ...

[glen]

Author: glen                         Date: Mon Jan 28 22:20:04 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- netfilter config merged to multiarch config

---- Files affected:
SPECS:
   kernel-vanilla.spec (1.69 -> 1.70) 

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.69 SPECS/kernel-vanilla.spec:1.70
--- SPECS/kernel-vanilla.spec:1.69	Mon Jan 28 21:18:54 2008
+++ SPECS/kernel-vanilla.spec	Mon Jan 28 23:19:59 2008
@@ -80,9 +80,9 @@
 Source6:	kernel-config.py
 
 Source19:	kernel-vanilla-multiarch.conf
+
 Source40:	kernel-vanilla-preempt-nort.config
 Source41:	kernel-vanilla-no-preempt-nort.config
-Source42:	kernel-vanilla-netfilter.config
 
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 3:2.14.90.0.7
@@ -473,8 +473,6 @@
 		python kernel-config.py %{_target_base_arch} $RPM_SOURCE_DIR/kernel-vanilla-no-preempt-nort.config \
 			arch/%{target_arch_dir}/defconfig arch/%{target_arch_dir}/defconfig
 	%endif
-	python kernel-config.py %{_target_base_arch} $RPM_SOURCE_DIR/kernel-vanilla-netfilter.config \
-		arch/%{target_arch_dir}/defconfig arch/%{target_arch_dir}/defconfig
 
 %{?debug:sed -i "s:# CONFIG_DEBUG_SLAB is not set:CONFIG_DEBUG_SLAB=y:" arch/%{target_arch_dir}/defconfig}
 %{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:" arch/%{target_arch_dir}/defconfig}
@@ -856,6 +854,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.70  2008-01-28 22:19:59  glen
+- netfilter config merged to multiarch config
+
 Revision 1.69  2008-01-28 20:18:54  glen
 - kernel-config.py was added as non-executale to cvs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-vanilla.spec?r1=1.69&r2=1.70&f=u