packages (PHP_5_2): php/php.spec, php/spl-shared.patch - pdo R spl; rel 7

[glen]

Author: glen                         Date: Sun Oct 18 17:04:45 2009 GMT
Module: packages                      Tag: PHP_5_2
---- Log message:
- pdo R spl; rel 7

---- Files affected:
packages/php:
   php.spec (1.805.2.22 -> 1.805.2.23) , spl-shared.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.805.2.22 packages/php/php.spec:1.805.2.23
--- packages/php/php.spec:1.805.2.22	Sun Oct 11 20:05:56 2009
+++ packages/php/php.spec	Sun Oct 18 19:04:39 2009
@@ -111,7 +111,7 @@
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		php
 Version:	5.2.11
-Release:	6
+Release:	7
 Epoch:		4
 License:	PHP
 Group:		Libraries
@@ -1076,7 +1076,7 @@
 Summary(pl.UTF-8):	Obsługa PHP Data Objects (PDO)
 Group:		Libraries
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Suggests:	%{name}-spl = %{epoch}:%{version}-%{release}
+Requires:	%{name}-spl = %{epoch}:%{version}-%{release}
 Provides:	php(pdo)
 Obsoletes:	php-pecl-PDO
 
@@ -1376,7 +1376,7 @@
 Group:		Libraries
 URL:		http://php.net/manual/en/book.spl.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	%{name}-pcre = %{epoch}:%{version}-%{release}
+Suggests:	%{name}-pcre = %{epoch}:%{version}-%{release}
 Provides:	php(spl)
 
 %description spl
@@ -2968,6 +2968,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.805.2.23  2009/10/18 17:04:39  glen
+- pdo R spl; rel 7
+
 Revision 1.805.2.22  2009/10/11 18:05:56  glen
 - fix magic mime path; rel 6
 

================================================================
Index: packages/php/spl-shared.patch
diff -u packages/php/spl-shared.patch:1.2 packages/php/spl-shared.patch:1.3
--- packages/php/spl-shared.patch:1.2	Thu Sep 24 17:52:37 2009
+++ packages/php/spl-shared.patch	Sun Oct 18 19:04:40 2009
@@ -63,3 +63,14 @@
  #endif
  
  /* {{{ defines */
+--- php-5.2.11/ext/pdo/pdo.c~	2009-07-20 01:46:03.000000000 +0300
++++ php-5.2.11/ext/pdo/pdo.c	2009-10-14 13:33:30.397508159 +0300
+@@ -127,7 +127,7 @@
+ /* {{{ pdo_functions[] */
+ #if ZEND_MODULE_API_NO >= 20050922
+ static zend_module_dep pdo_deps[] = {
+-#ifdef HAVE_SPL
++#ifdef HAVE_SPL && !COMPILE_DL_SPL
+ 	ZEND_MOD_REQUIRED("spl")
+ #endif
+ 	{NULL, NULL, NULL}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.805.2.22&r2=1.805.2.23&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/spl-shared.patch?r1=1.2&r2=1.3&f=u