SPECS (LINUX_2_6): kernel.spec - sort out patches and ifarchs

[baggins]

Author: baggins                      Date: Fri May  5 13:54:44 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- sort out patches and ifarchs

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1524 -> 1.441.2.1525) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1524 SPECS/kernel.spec:1.441.2.1525
--- SPECS/kernel.spec:1.441.2.1524	Fri May  5 15:48:59 2006
+++ SPECS/kernel.spec	Fri May  5 15:54:39 2006
@@ -237,7 +237,6 @@
 
 # vserver from: http://vserver.13thfloor.at/Experimental/patch-2.6.16-vs2.1.1-rc15.diff
 Patch100:	linux-2.6-vs2.1.patch
-Patch101:	linux-2.6-vs2.1-grsec-minimal.patch
 
 # from http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-3.0.2-src.tgz
 Patch120:	xen-3.0-2.6.16.patch
@@ -738,23 +737,23 @@
 %patch56 -p1
 
 
-%ifarch %{ix86} ia64 x86_64
+%ifarch %{ix86} %{x8664} ia64
 %patch57 -p1
 %endif
 
 %patch60 -p1
 
 %patch100 -p1
-%if %{with grsec_minimal}
-%patch101 -p1
-%endif
 
 %if %{with xen0} || %{with xenU}
-%ifarch %{ix86}
+%ifarch %{ix86} %{x8664} ia64
 %patch120 -p1
 %endif
 %endif
 
+%if %{with grsec_minimal}
+%patch1000 -p1
+%endif
 %if %{with grsec_full}
 %error TODO
 %patch9999 -p1
@@ -1583,6 +1582,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1525  2006/05/05 13:54:39  baggins
+- sort out patches and ifarchs
+
 Revision 1.441.2.1524  2006/05/05 13:48:59  baggins
 - up to 2.6.16.14
 
================================================================

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