SPECS: php.spec - patch numbering cleanups

[adamg]

Author: adamg                        Date: Fri Feb 27 17:23:16 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- patch numbering cleanups

---- Files affected:
SPECS:
   php.spec (1.777 -> 1.778) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.777 SPECS/php.spec:1.778
--- SPECS/php.spec:1.777	Fri Feb 27 10:17:04 2009
+++ SPECS/php.spec	Fri Feb 27 18:23:11 2009
@@ -133,31 +133,30 @@
 Patch19:	%{name}-gd_imagerotate_enable.patch
 Patch20:	%{name}-uint32_t.patch
 Patch21:	%{name}-dba-link.patch
-#Patch22
-Patch23:	%{name}-both-apxs.patch
-Patch24:	%{name}-builddir.patch
-Patch25:	%{name}-zlib-for-getimagesize.patch
-Patch26:	%{name}-versioning.patch
-Patch28:	%{name}-pear.patch
-Patch29:	%{name}-config-dir.patch
-Patch30:	%{name}-bug-42952.patch
-Patch31:	%{name}-fcgi-graceful.patch
-Patch32:	%{name}-apr-apu.patch
-Patch33:	%{name}-fcgi-error_log-no-newlines.patch
-Patch34:	%{name}-curl-limit-speed.patch
-Patch36:	%{name}-mime_magic.patch
-Patch37:	%{name}-libtool.patch
-Patch38:	%{name}-tds.patch
-Patch39:	%{name}-mysql-charsetphpini.patch
-Patch40:	%{name}-mysqli-charsetphpini.patch
-Patch41:	%{name}-pdo_mysql-charsetphpini.patch
-Patch43:	%{name}-use-prog_sendmail.patch
-Patch44:	%{name}-fpm.patch
-Patch48:	%{name}-fpm-config.patch
-Patch49:	%{name}-fpm-initdir.patch
+Patch22:	%{name}-both-apxs.patch
+Patch23:	%{name}-builddir.patch
+Patch24:	%{name}-zlib-for-getimagesize.patch
+Patch25:	%{name}-versioning.patch
+Patch26:	%{name}-pear.patch
+Patch27:	%{name}-config-dir.patch
+Patch28:	%{name}-bug-42952.patch
+Patch29:	%{name}-fcgi-graceful.patch
+Patch30:	%{name}-apr-apu.patch
+Patch31:	%{name}-fcgi-error_log-no-newlines.patch
+Patch32:	%{name}-curl-limit-speed.patch
+Patch33:	%{name}-mime_magic.patch
+Patch34:	%{name}-libtool.patch
+Patch35:	%{name}-tds.patch
+Patch36:	%{name}-mysql-charsetphpini.patch
+Patch37:	%{name}-mysqli-charsetphpini.patch
+Patch38:	%{name}-pdo_mysql-charsetphpini.patch
+Patch39:	%{name}-use-prog_sendmail.patch
+Patch40:	%{name}-fpm.patch
+Patch41:	%{name}-fpm-config.patch
+Patch42:	%{name}-fpm-initdir.patch
 # drop when http://bugs.php.net/bug.php?id=45996 solved
-Patch50:	%{name}-xml-force-expat.patch
-Patch51:	%{name}-include_path.patch
+Patch43:	%{name}-xml-force-expat.patch
+Patch44:	%{name}-include_path.patch
 URL:		http://www.php.net/
 # Requires review:
 # http://securitytracker.com/alerts/2008/Oct/1020995.html
@@ -1642,12 +1641,11 @@
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
-
+%patch22 -p1
 %patch23 -p1
 %patch24 -p1
-%patch25 -p1
 
-%{?with_versioning:%patch26 -p1}
+%{?with_versioning:%patch25 -p1}
 
 %if 0
 %{__tar} jxf %{SOURCE9}
@@ -1658,34 +1656,34 @@
 done
 %endif
 
+%patch26 -p1
+%patch27 -p1
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
-%patch31 -p1
+#%patch31 -p1
 %patch32 -p1
-#%patch33 -p1
-%patch34 -p1
-%patch36 -p1
+%patch33 -p1
 %if "%{pld_release}" != "ac"
-%patch37 -p1
+%patch34 -p1
 %endif
-%patch38 -p1
+%patch35 -p1
 
 # mysql default charset for mysql/mysql/pdo-mysql extensions
-%patch39 -p1
-%patch40 -p0
-%patch41 -p0
+%patch36 -p1
+%patch37 -p0
+%patch38 -p0
 
-%patch43 -p1
+%patch39 -p1
 
 %if %{with fpm}
-%patch44 -p1
-%patch48 -p1
-%patch49 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
 %endif
 
-%patch50 -p1
-%patch51 -p1
+%patch43 -p1
+%patch44 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -2890,6 +2888,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.778  2009/02/27 17:23:11  adamg
+- patch numbering cleanups
+
 Revision 1.777  2009/02/27 09:17:04  adamg
 - updated to 5.2.9 ( fixes CVE-2008-5498 )
 - -ini and -fpm patches updated
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.777&r2=1.778&f=u