SPECS: kernel-desktop.spec - nock-compat updated, don't let build ...

[sparky]

Author: sparky                       Date: Sat Nov 18 22:49:19 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- nock-compat updated, don't let build with both ck and rt

---- Files affected:
SPECS:
   kernel-desktop.spec (1.76 -> 1.77) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.76 SPECS/kernel-desktop.spec:1.77
--- SPECS/kernel-desktop.spec:1.76	Sat Nov 18 13:55:07 2006
+++ SPECS/kernel-desktop.spec	Sat Nov 18 23:49:14 2006
@@ -620,11 +620,14 @@
 %if %{with ck}
 %if %{with preemptrt}
 #%%patch6 -p1	NEEDS UPDATE
+: ck patch for preemptrt-patched kernel is not prepared
+: try --without ck
+exit 1
 %else
 %patch7 -p1
 %endif
 %else
-#%%patch8 -p1	NEEDS UPDATE
+%patch8 -p1
 %endif
 
 # grsecurity
@@ -1346,6 +1349,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.77  2006/11/18 22:49:14  sparky
+- nock-compat updated, don't let build with both ck and rt
+
 Revision 1.76  2006/11/18 12:55:07  lmasko
 - Updated patch for vesafb_tng - adjusted the 1.0-rc2-2.6.19-rc2 version, seems to work.
 
================================================================

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