SPECS (LINUX_2_6): kernel.spec - prevent conflict in CONFIG_SOFTWA...

[sparky]

Author: sparky                       Date: Fri Mar 17 21:37:33 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- prevent conflict in CONFIG_SOFTWARE_SUSPEND

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1417 -> 1.441.2.1418) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1417 SPECS/kernel.spec:1.441.2.1418
--- SPECS/kernel.spec:1.441.2.1417	Thu Mar 16 12:25:02 2006
+++ SPECS/kernel.spec	Fri Mar 17 22:37:27 2006
@@ -1118,6 +1118,7 @@
 %endif
 %if %{with suspend}
 	if [ "$smp" != "yes" ]; then
+		sed -i '/# CONFIG_SOFTWARE_SUSPEND is not set/d' arch/%{_target_base_arch}/defconfig
 		cat %{SOURCE97} >> arch/%{_target_base_arch}/defconfig
 	fi
 %endif
@@ -1847,6 +1848,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1418  2006/03/17 21:37:27  sparky
+- prevent conflict in CONFIG_SOFTWARE_SUSPEND
+
 Revision 1.441.2.1417  2006/03/16 11:25:02  qboosh
 - removed duplicate Group
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1417&r2=1.441.2.1418&f=u