SPECS (LINUX_2_6): kernel.spec - do not add patches after conditio...

pluto pluto at pld-linux.org
Tue Nov 8 18:09:52 CET 2005


Author: pluto                        Date: Tue Nov  8 17:09:52 2005 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- do not add patches after conditional patchset!
  use existing unused slots!

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1289 -> 1.441.2.1290) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1289 SPECS/kernel.spec:1.441.2.1290
--- SPECS/kernel.spec:1.441.2.1289	Tue Nov  8 15:08:16 2005
+++ SPECS/kernel.spec	Tue Nov  8 18:09:43 2005
@@ -300,6 +300,7 @@
 # http://www.kismetwireless.net/download.shtml#orinoco2611
 #Patch95:	orinoco-2.6.12-rfmon-dragorn-1.diff	NEEDS UPDATE
 
+Patch101:	kernel-pcmcia_bufor.patch
 Patch102:	linux-2.6-smbfs.patch
 Patch103:	linux-2.6-iriver-backing-device-capability-information-fix.patch
 Patch104:	linux-2.6-datagram-core.patch
@@ -338,7 +339,7 @@
 Patch401:	kernel-hotfixes.patch
 Patch402:	linux-em8300-2.6.11.2.patch
 
-Patch410:	kernel-pcmcia_bufor.patch
+
 
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 2.14.90.0.7
@@ -816,6 +817,7 @@
 
 ##%patch95 -p1		NEEDS UPDATE
 
+%patch101 -p1
 %patch102 -p1
 %patch103 -p1
 %patch104 -p1
@@ -863,8 +865,6 @@
 %patch402 -p1
 %endif
 
-%patch410 -p1
-
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}#g' Makefile
 
@@ -1706,6 +1706,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1290  2005/11/08 17:09:43  pluto
+- do not add patches after conditional patchset!
+  use existing unused slots!
+
 Revision 1.441.2.1289  2005/11/08 14:08:16  cieciwa
 - added pcmcia_bufer patch
 
================================================================

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




More information about the pld-cvs-commit mailing list