packages: php/php.spec - revised some patches: - drop acam.patch - ac2.53b...

[glen]

Author: glen                         Date: Fri Feb 19 23:54:19 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- revised some patches:
 - drop acam.patch - ac2.53b/am1.6b patch no longer needed
 - drop tsrmlsfetchgcc2.patch - we no longer support gcc 2
 - drop sybase-fix.patch - sybase ext is dropped
 - drop bug-42952.patch -- solved upstream
 - drop apr-apu.patch - outdated, apxs -q APR_CONFIG/-q APU_CONFIG work ok
 - drop mime_magic.patch - mime_magic ext is dropped
 - restored pear.patch
 - restored fcgi-error_log-no-newlines.patch
 - restored curl-limit-speed.patch
 - restored libtool.patch

---- Files affected:
packages/php:
   php.spec (1.838 -> 1.839) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.838 packages/php/php.spec:1.839
--- packages/php/php.spec:1.838	Sun Feb  7 15:30:26 2010
+++ packages/php/php.spec	Sat Feb 20 00:54:14 2010
@@ -1,19 +1,9 @@
 # $Revision$, $Date$
 # TODO
 # - lost patches:
-#   +Patch11:	%{name}-acam.patch
-#   +Patch13:	%{name}-tsrmlsfetchgcc2.patch
-#   +Patch16:	%{name}-sybase-fix.patch
-#   +Patch26:	%{name}-pear.patch
-#   +Patch28:	%{name}-bug-42952.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
-#   +Patch36:	%{name}-mysql-charsetphpini.patch
-#   +Patch37:	%{name}-mysqli-charsetphpini.patch
-#   +Patch38:	%{name}-pdo_mysql-charsetphpini.patch
+#Patch36:	%{name}-mysql-charsetphpini.patch
+#Patch37:	%{name}-mysqli-charsetphpini.patch
+#Patch38:	%{name}-pdo_mysql-charsetphpini.patch
 #   +Patch44:	%{name}-include_path.patch
 #   +Patch45:	%{name}-imap-annotations.patch
 #   +Patch46:	%{name}-imap-myrights.patch
@@ -107,7 +97,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel		1.12
+%define		rel		1.13
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -141,8 +131,8 @@
 Patch8:		%{name}-config-file-scan-dir.patch
 Patch9:		%{name}-sh.patch
 Patch10:	%{name}-ini.patch
-# untill 5.3.2 when this gets released
-Patch11:	%{name}-bug-50458.patch
+# until 5.3.2 when this gets released
+Patch111:	%{name}-bug-50458.patch
 %if %{with type_hints}
 Patch12:	http://ilia.ws/patch/type_hint_53_v2.txt
 %endif
@@ -157,8 +147,12 @@
 Patch23:	%{name}-builddir.patch
 Patch24:	%{name}-zlib-for-getimagesize.patch
 Patch25:	%{name}-stupidapache_version.patch
+Patch26:	%{name}-pear.patch
 Patch27:	%{name}-config-dir.patch
 Patch29:	%{name}-fcgi-graceful.patch
+Patch31:	%{name}-fcgi-error_log-no-newlines.patch
+Patch32:	%{name}-curl-limit-speed.patch
+Patch34:	%{name}-libtool.patch
 Patch35:	%{name}-tds.patch
 Patch39:	%{name}-use-prog_sendmail.patch
 Patch40:	%{name}-fpm.patch
@@ -1736,8 +1730,12 @@
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
+%patch26 -p1
 %patch27 -p1
 %patch29 -p1
+%patch31 -p1
+%patch32 -p1
+%patch34 -p1
 %patch35 -p1
 %patch39 -p1
 %if %{with fpm}
@@ -1754,7 +1752,7 @@
 %patch51 -p1
 %patch52 -p1
 
-%patch11 -p4
+%patch111 -p4
 
 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
 
@@ -1917,6 +1915,7 @@
 	%{?with_sqlite:--with-pdo-sqlite=shared,/usr} \
 	--without-libexpat-dir \
 	--enable-mysqlnd-threading \
+	--enable-overload=shared \
 	--enable-posix=shared \
 	--enable-shared \
 	--enable-session=shared \
@@ -2972,6 +2971,19 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.839  2010/02/19 23:54:14  glen
+- revised some patches:
+ - drop acam.patch - ac2.53b/am1.6b patch no longer needed
+ - drop tsrmlsfetchgcc2.patch - we no longer support gcc 2
+ - drop sybase-fix.patch - sybase ext is dropped
+ - drop bug-42952.patch -- solved upstream
+ - drop apr-apu.patch - outdated, apxs -q APR_CONFIG/-q APU_CONFIG work ok
+ - drop mime_magic.patch - mime_magic ext is dropped
+ - restored pear.patch
+ - restored fcgi-error_log-no-newlines.patch
+ - restored curl-limit-speed.patch
+ - restored libtool.patch
+
 Revision 1.838  2010/02/07 14:30:26  pawelz
 - dropped php-litespeed R: litespeed. php-litespeed may comunicate with litespeed via network
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.838&r2=1.839&f=u