packages (PHP_5_2): php/php.spec - shared spl

glen glen at pld-linux.org
Fri Sep 25 14:55:28 CEST 2009


Author: glen                         Date: Fri Sep 25 12:55:28 2009 GMT
Module: packages                      Tag: PHP_5_2
---- Log message:
- shared spl

---- Files affected:
packages/php:
   php.spec (1.805.2.15 -> 1.805.2.16) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.805.2.15 packages/php/php.spec:1.805.2.16
--- packages/php/php.spec:1.805.2.15	Wed Sep 23 12:40:04 2009
+++ packages/php/php.spec	Fri Sep 25 14:55:22 2009
@@ -111,7 +111,7 @@
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		php
 Version:	5.2.11
-Release:	3
+Release:	3.16
 Epoch:		4
 License:	PHP
 Group:		Libraries
@@ -179,6 +179,7 @@
 Patch47:	suhosin.patch
 Patch49:	%{name}-m4-divert.patch
 Patch50:	extension-shared-optional-dep.patch
+Patch51:	spl-shared.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}
@@ -433,7 +434,6 @@
 Summary(ru.UTF-8):	Разделяемые библиотеки для php
 Summary(uk.UTF-8):	Бібліотеки спільного використання для php
 Group:		Libraries
-Requires:	%{name}-simplexml = %{epoch}:%{version}-%{release}
 # because of dlclose() bugs in glibc <= 2.3.4 causing SEGVs on exit
 Requires:	glibc >= 6:2.3.5
 Requires:	php-dirs
@@ -444,7 +444,6 @@
 Provides:	php(overload)
 %{?with_pcre:Provides:	php(pcre)}
 Provides:	php(reflection)
-Provides:	php(spl)
 Provides:	php(standard)
 Provides:	php(zend_extension_api) = %{zend_extension_api}
 Provides:	php(zend_module_api) = %{zend_module_api}
@@ -900,8 +899,8 @@
 Summary:	mime_magic extension module for PHP
 Summary(pl.UTF-8):	Moduł mime_magic dla PHP
 Group:		Libraries
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{magic_mime}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(mime_magic)
 
 %description mime_magic
@@ -966,6 +965,7 @@
 Summary(pl.UTF-8):	Moduł MySQLi dla PHP
 Group:		Libraries
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-spl = %{epoch}:%{version}-%{release}
 Requires:	mysql-libs >= 4.1.0
 Provides:	php(mysqli)
 
@@ -1063,6 +1063,7 @@
 Summary(pl.UTF-8):	Obsługa PHP Data Objects (PDO)
 Group:		Libraries
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-spl = %{epoch}:%{version}-%{release}
 Provides:	php(pdo)
 Obsoletes:	php-pecl-PDO
 
@@ -1302,6 +1303,7 @@
 Summary(pl.UTF-8):	Moduł prostego rozszerzenia XML dla PHP
 Group:		Libraries
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-spl = %{epoch}:%{version}-%{release}
 Provides:	php(simplexml)
 
 %description simplexml
@@ -1354,6 +1356,22 @@
 %description sockets -l pl.UTF-8
 Moduł PHP dodający obsługę gniazdek.
 
+%package spl
+Summary:	Standard PHP Library module for PHP
+Summary(pl.UTF-8):	Moduł SPL dla PHP
+Group:		Libraries
+URL:		http://www.php.net/~helly/php/ext/spl/
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-simplexml = %{epoch}:%{version}-%{release}
+Provides:	php(spl)
+
+%description spl
+This is a dynamic shared object (DSO) for PHP that will add Standard
+PHP Library support.
+
+%description spl -l pl.UTF-8
+Moduł PHP dodający obsługę gniazdek.
+
 %package sqlite
 Summary:	SQLite extension module for PHP
 Summary(pl.UTF-8):	Moduł SQLite dla PHP
@@ -1705,6 +1723,7 @@
 %endif
 %patch49 -p1
 %patch50 -p1
+%patch51 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -1733,7 +1752,7 @@
 mv ext/standard/tests/general_functions/bug39322.phpt{,.broken}
 %endif
 
-cp -f Zend/LICENSE{,.Zend}
+cp -af Zend/LICENSE{,.Zend}
 
 %build
 API=$(awk '/#define PHP_API_VERSION/{print $3}' main/php.h)
@@ -1862,6 +1881,7 @@
 	--enable-session=shared \
 	--enable-shmop=shared \
 	--enable-simplexml=shared \
+	--enable-spl=shared \
 	--enable-sysvmsg=shared \
 	--enable-sysvsem=shared \
 	--enable-sysvshm=shared \
@@ -2058,6 +2078,8 @@
 		conf="%{_sysconfdir}/conf.d/$mod.ini"
 		# xml needs to be loaded before wddx
 		[ "$mod" = "wddx" ] && conf="%{_sysconfdir}/conf.d/xml_$mod.ini"
+		# spl needs to be loaded before mysqli
+		[ "$mod" = "spl" ] && conf="%{_sysconfdir}/conf.d/SPL.ini"
 		echo "+ $conf"
 		cat > $RPM_BUILD_ROOT$conf <<-EOF
 			; Enable $mod extension module
@@ -2223,6 +2245,7 @@
 %extension_scripts snmp
 %extension_scripts soap
 %extension_scripts sockets
+%extension_scripts spl
 %extension_scripts sqlite
 %extension_scripts sybase
 %extension_scripts sybase-ct
@@ -2785,7 +2808,6 @@
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/simplexml.ini
 %attr(755,root,root) %{php_extensiondir}/simplexml.so
-%endif
 
 %files session
 %defattr(644,root,root,755)
@@ -2815,6 +2837,13 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sockets.ini
 %attr(755,root,root) %{php_extensiondir}/sockets.so
 
+%files spl
+%defattr(644,root,root,755)
+%doc ext/spl/{CREDITS,README,TODO}
+%doc ext/spl/examples
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/SPL.ini
+%attr(755,root,root) %{php_extensiondir}/spl.so
+
 %if %{with sqlite}
 %files sqlite
 %defattr(644,root,root,755)
@@ -2913,6 +2942,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.805.2.16  2009/09/25 12:55:22  glen
+- shared spl
+
 Revision 1.805.2.15  2009/09/23 10:40:04  glen
 - build simplexml as shared
 
================================================================

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



More information about the pld-cvs-commit mailing list