Author: arekm Date: Wed Apr 13 18:50:54 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 7; lower mysql header vs library mismatch warnings to notice level
---- Files affected:
packages/php:
php.spec (1.935 -> 1.936) , php-mysql-nowarning.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.935 packages/php/php.spec:1.936
--- packages/php/php.spec:1.935 Sat Apr 9 16:18:56 2011
+++ packages/php/php.spec Wed Apr 13 20:50:49 2011
@@ -104,7 +104,7 @@
%undefine with_filter
%endif
-%define rel 6
+%define rel 7
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -187,6 +187,7 @@
Patch60: %{name}-oracle-instantclient.patch
Patch61: %{name}-krb5-ac.patch
Patch62: mcrypt-libs.patch
+Patch63: %{name}-mysql-nowarning.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}
@@ -1866,6 +1867,7 @@
%patch60 -p1
%patch61 -p1
%patch62 -p1
+%patch63 -p1
%{__rm} -r sapi/litespeed
gzip -dc %{SOURCE15} | tar xf - -C sapi/
@@ -3171,6 +3173,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.936 2011/04/13 18:50:49 arekm
+- rel 7; lower mysql header vs library mismatch warnings to notice level
+
Revision 1.935 2011/04/09 14:18:56 glen
- remove bogus ltdl linking on mcrypt (-lltdl is on -lmcrypt not php ext)
================================================================
Index: packages/php/php-mysql-nowarning.patch
diff -u /dev/null packages/php/php-mysql-nowarning.patch:1.1
--- /dev/null Wed Apr 13 20:50:54 2011
+++ packages/php/php-mysql-nowarning.patch Wed Apr 13 20:50:49 2011
@@ -0,0 +1,22 @@
+--- php-5.3.6/ext/mysql/php_mysql.c~ 2011-04-13 20:47:29.263652096 +0200
++++ php-5.3.6/ext/mysql/php_mysql.c 2011-04-13 20:48:30.206453191 +0200
+@@ -706,7 +706,7 @@
+
+ #if !defined(MYSQL_USE_MYSQLND)
+ if ((MYSQL_VERSION_ID / 100) != (mysql_get_client_version() / 100)) {
+- php_error_docref(NULL TSRMLS_CC, E_WARNING,
++ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
+ "Headers and client library
minor version mismatch. Headers:%d Library:%ld",
+ MYSQL_VERSION_ID,
mysql_get_client_version());
+ }
+--- php-5.3.6/ext/mysqli/mysqli_nonapi.c~ 2011-04-13 20:47:29.273652556
+0200
++++ php-5.3.6/ext/mysqli/mysqli_nonapi.c 2011-04-13 20:48:41.070285840
+0200
+@@ -75,7 +75,7 @@
+
+ #if !defined(MYSQL_USE_MYSQLND)
+ if ((MYSQL_VERSION_ID / 100) != (mysql_get_client_version() / 100)) {
+- php_error_docref(NULL TSRMLS_CC, E_WARNING,
++ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
+ "Headers and client library
minor version mismatch. Headers:%d Library:%ld",
+ MYSQL_VERSION_ID,
mysql_get_client_version());
+ }
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.935&r2=1.936&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
