SPECS: kernel-desktop.spec - apply suspend2 before ck, patches done

[sparky]

Author: sparky                       Date: Fri Jun 23 19:20:41 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- apply suspend2 before ck, patches done

---- Files affected:
SPECS:
   kernel-desktop.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.29 SPECS/kernel-desktop.spec:1.30
--- SPECS/kernel-desktop.spec:1.29	Fri Jun 23 18:55:45 2006
+++ SPECS/kernel-desktop.spec	Fri Jun 23 21:20:35 2006
@@ -115,14 +115,14 @@
 Patch1:		kernel-desktop-preempt_ppc_fix.patch
 Patch2:		kernel-desktop-nopreempt-compat.patch
 
+Patch3:		kernel-desktop-suspend2.patch
+Patch4:		kernel-desktop-suspend2-rt.patch
+Patch5:		kernel-desktop-suspend2-nort.patch
+
 # Con Kolivas patchset
-Patch3:		kernel-desktop-fcache.patch
-Patch4:		kernel-desktop-ck.patch
-Patch5:		kernel-desktop-nock-compat.patch
-
-Patch6:		kernel-desktop-suspend2.patch
-Patch7:		kernel-desktop-suspend2-rt.patch
-Patch8:		kernel-desktop-suspend2-nort.patch
+Patch6:		kernel-desktop-fcache.patch
+Patch7:		kernel-desktop-ck.patch
+Patch8:		kernel-desktop-nock-compat.patch
 
 Patch9:		kernel-desktop-grsec-minimal.patch
 
@@ -645,21 +645,21 @@
 %patch2 -p1
 %endif
 
-# Con Kolivas patchset
-%if %{with ck}
-%if %{with preemptrt}
+# suspend 2
 %patch3 -p1
-%else
+%if %{with preemptrt}
 %patch4 -p1
-%endif
 %else
 %patch5 -p1
 %endif
 
-# suspend 2
-%patch6 -p1
+# Con Kolivas patchset
+%if %{with ck}
 %if %{with preemptrt}
+%patch6 -p1
+%else
 %patch7 -p1
+%endif
 %else
 %patch8 -p1
 %endif
@@ -805,9 +805,7 @@
 	cat %{SOURCE42} >> arch/%{_target_base_arch}/defconfig
 %endif
 
-%if %{with suspend2}
 	cat %{SOURCE43} >> arch/%{_target_base_arch}/defconfig
-%endif
 
 	# fbsplash, vesafb-tng, squashfs, imq, tahoe, atm, reiser4
 	cat %{SOURCE44} >> arch/%{_target_base_arch}/defconfig
@@ -1409,6 +1407,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2006/06/23 19:20:35  sparky
+- apply suspend2 before ck, patches done
+
 Revision 1.29  2006/06/23 16:55:45  sparky
 - (re)organised patching, NFY
 
================================================================

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