SPECS (LINUX_2_6): kernel.spec - skip double grsec patching

[baggins]

Author: baggins                      Date: Wed Apr 12 15:55:56 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- skip double grsec patching

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1481 -> 1.441.2.1482) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1481 SPECS/kernel.spec:1.441.2.1482
--- SPECS/kernel.spec:1.441.2.1481	Wed Apr 12 17:36:49 2006
+++ SPECS/kernel.spec	Wed Apr 12 17:55:50 2006
@@ -735,10 +735,10 @@
 %endif
 %endif
 
-%if %{with grsec_minimal}
-patch1000 -p1
+%if %{with grsec_minimal} && %{without vserver}
+%patch1000 -p1
 %endif
-%if %{with grsec_full}
+%if %{with grsec_full} && %{without vserver}
 #patch9999 -p1
 %endif
 
@@ -1575,6 +1575,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1482  2006/04/12 15:55:50  baggins
+- skip double grsec patching
+
 Revision 1.441.2.1481  2006/04/12 15:36:49  baggins
 - rel 1.7
 - added minimal grsecurity
================================================================

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