packages: php/php.spec - revert mbstring changes from 5.2.10. php bug #4869...

[glen]

Author: glen                         Date: Thu Jun 25 19:51:09 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- revert mbstring changes from 5.2.10. php bug #48697; rel 4

---- Files affected:
packages/php:
   php.spec (1.800 -> 1.801) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.800 packages/php/php.spec:1.801
--- packages/php/php.spec:1.800	Thu Jun 25 20:15:33 2009
+++ packages/php/php.spec	Thu Jun 25 21:51:04 2009
@@ -95,7 +95,7 @@
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		php
 Version:	5.2.10
-Release:	3
+Release:	4
 Epoch:		4
 License:	PHP
 Group:		Libraries
@@ -160,6 +160,7 @@
 Patch45:	%{name}-imap-annotations.patch
 Patch46:	%{name}-imap-myrights.patch
 Patch47:	suhosin.patch
+Patch48:	%{name}-bug-48697.patch
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -1672,6 +1673,7 @@
 %if %{with suhosin}
 %patch47 -p1
 %endif
+%patch48 -R -p3
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -2880,6 +2882,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.801  2009/06/25 19:51:04  glen
+- revert mbstring changes from 5.2.10. php bug #48697; rel 4
+
 Revision 1.800  2009/06/25 18:15:33  glen
 - with --enable-zend-multibyte mbstring needs to be linked static:
   Cannot load /etc/apache/modules/libphp5.so into server: /etc/apache/modules/libphp5.so: undefined symbol: php_mb_set_zend_encoding
================================================================

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