packages (DEVEL): php/php-pdo_mysql-charsetphpini.patch, php/php.spec - up ...

[glen]

Author: glen                         Date: Thu Dec  8 07:55:32 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 5.4.0RC2

---- Files affected:
packages/php:
   php-pdo_mysql-charsetphpini.patch (1.6 -> 1.6.2.1) , php.spec (1.945.2.4 -> 1.945.2.5) 

---- Diffs:

================================================================
Index: packages/php/php-pdo_mysql-charsetphpini.patch
diff -u packages/php/php-pdo_mysql-charsetphpini.patch:1.6 packages/php/php-pdo_mysql-charsetphpini.patch:1.6.2.1
--- packages/php/php-pdo_mysql-charsetphpini.patch:1.6	Sun Jul 25 12:15:50 2010
+++ packages/php/php-pdo_mysql-charsetphpini.patch	Thu Dec  8 08:55:26 2011
@@ -46,16 +46,6 @@
  
  	return SUCCESS;
  }
-@@ -108,9 +107,7 @@
- 
- 	php_info_print_table_end();
- 
--#ifdef PDO_USE_MYSQLND
- 	DISPLAY_INI_ENTRIES();
--#endif
- }
- /* }}} */
- 
 @@ -161,6 +161,7 @@
  	pdo_mysql_globals->debug = NULL;	/* The actual string */
  	pdo_mysql_globals->dbg = NULL;	/* The DBG object*/

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.945.2.4 packages/php/php.spec:1.945.2.5
--- packages/php/php.spec:1.945.2.4	Sun Nov  6 12:39:19 2011
+++ packages/php/php.spec	Thu Dec  8 08:55:26 2011
@@ -9,7 +9,8 @@
 # - dba: enable: --with-tcadb=DIR        DBA: Tokyo Cabinet abstract DB support
 # - --with-vpx-dir=DIR     GD: Set the path to libvpx install prefix
 # --with-libmbfl=DIR      MBSTRING: Use external libmbfl.  DIR is the libmbfl base install directory BUNDLED
-# --with-onig=DIR         MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix.  
+# --with-onig=DIR         MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix.
+# - recheck: define PDO_MYSQL_UNIX_ADDR (ensure if's correct with mysql-libs and mysqlng)
 # NOTE: mysqlnd does not support ssl or compression (see FAQ at http://dev.mysql.com/downloads/connector/php-mysqlnd/)
 # UNPACKAGED EXTENSION NOTES:
 # - com_dotnet is Win32-only
@@ -122,7 +123,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel	0.3
+%define		rel	0.4
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -136,8 +137,8 @@
 License:	PHP
 Group:		Libraries
 #Source0:	http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-Source0:	http://downloads.php.net/stas/%{name}-%{version}beta2.tar.bz2
-# Source0-md5:	51c6e9f1d83f94a323db4c4d5e65e421
+Source0:	http://downloads.php.net/stas/%{name}-%{version}RC2.tar.bz2
+# Source0-md5:	7e5ad382db17a81f0cd3c092399cb4af
 Source2:	%{name}-mod_%{name}.conf
 Source3:	%{name}-cgi-fcgi.ini
 Source4:	%{name}-apache.ini
@@ -1852,7 +1853,7 @@
 Moduł PHP umożliwiający używanie kompresji zlib.
 
 %prep
-%setup -q -n %{name}-%{version}beta2
+%setup -q -n %{name}-%{version}RC2
 # prep for suhosin patch
 %undos Zend/Zend.dsp Zend/ZendTS.dsp
 %patch0 -p1
@@ -3281,6 +3282,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.945.2.5  2011/12/08 07:55:26  glen
+- up to 5.4.0RC2
+
 Revision 1.945.2.4  2011/11/06 11:39:19  glen
 - up to php 5.4.0beta2
   - snmp depends now on spl ext
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-pdo_mysql-charsetphpini.patch?r1=1.6&r2=1.6.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.945.2.4&r2=1.945.2.5&f=u