SPECS (LINUX_2_6_14): kernel.spec - do not add patches after condi...

[pluto]

Author: pluto                        Date: Wed Feb  1 13:31:23 2006 GMT
Module: SPECS                         Tag: LINUX_2_6_14
---- Log message:
- do not add patches after conditional patchset.
  use existing unused slots!.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1357.2.18 -> 1.441.2.1357.2.19) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1357.2.18 SPECS/kernel.spec:1.441.2.1357.2.19
--- SPECS/kernel.spec:1.441.2.1357.2.18	Wed Feb  1 12:05:51 2006
+++ SPECS/kernel.spec	Wed Feb  1 14:31:18 2006
@@ -225,6 +225,7 @@
 Patch1:		linux-2.6-version.patch
 Patch2:		linux-2.6-biarch-build.patch
 Patch3:		2.6.0-t9-acpi_osl-lkml.patch
+
 Patch5:		kernel-MAX_INIT_ARGS.patch
 Patch6:		linux-2.6-extended-utf8.patch
 Patch7:		linux-2.6-realtime-lsm-0.1.1.patch
@@ -336,6 +337,8 @@
 Patch108:	linux-2.6-tty-races.patch
 Patch109:	linux-2.6-secunia-17786-1.patch
 Patch110:	linux-2.6-cputime-misscalculation.patch
+Patch111:	linux-2.6.14-cx88-debug-printk.patch
+Patch112:	linux-2.6.14-skb_reserve.patch
 
 # derived from ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-kernel-diffs
 Patch115:	linux-2.6-atm-vbr.patch
@@ -366,8 +369,6 @@
 Patch400:	kernel-gcc4.patch
 Patch401:	kernel-hotfixes.patch
 Patch402:	linux-em8300-2.6.11.2.patch
-Patch403:	linux-2.6.14-cx88-debug-printk.patch
-Patch404:	linux-2.6.14-skb_reserve.patch
 
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 2.14.90.0.7
@@ -767,6 +768,7 @@
 %{?with_pld_vers:%patch1 -p0}
 %patch2 -p1
 %patch3 -p1
+
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
@@ -869,6 +871,8 @@
 %patch108 -p1
 %patch109 -p1
 %patch110 -p1
+%patch111 -p1
+%patch112 -p1
 
 %patch115 -p1
 %patch116 -p1
@@ -909,8 +913,6 @@
 %if %{with em8300}
 %patch402 -p1
 %endif
-%patch403 -p1
-%patch404 -p1
 
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}#g' Makefile
@@ -1786,6 +1788,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1357.2.19  2006/02/01 13:31:18  pluto
+- do not add patches after conditional patchset.
+  use existing unused slots!.
+
 Revision 1.441.2.1357.2.18  2006/02/01 11:05:51  charles
 - added -skb_reserve.patch (applied in 2.6.15.2)
 - rel. 6
================================================================

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