packages (DEVEL): php/php.spec - up to php 5.4.0beta2 - snmp depends now ...

glen glen at pld-linux.org
Sun Nov 6 12:39:24 CET 2011


Author: glen                         Date: Sun Nov  6 11:39:24 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to php 5.4.0beta2
  - snmp depends now on spl ext

---- Files affected:
packages/php:
   php.spec (1.945.2.3 -> 1.945.2.4) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.945.2.3 packages/php/php.spec:1.945.2.4
--- packages/php/php.spec:1.945.2.3	Sat Nov  5 21:40:03 2011
+++ packages/php/php.spec	Sun Nov  6 12:39:19 2011
@@ -78,7 +78,7 @@
 %bcond_with	zts		# Zend Thread Safety
 %bcond_without	cgi		# disable CGI/FCGI SAPI
 %bcond_without	fpm		# disable FPM
-%bcond_without	embed		# disable Embedded API
+%bcond_with	embed		# disable Embedded API
 %bcond_with	suhosin		# with suhosin patch
 %bcond_with	tests		# default off; test process very often hangs on builders, approx run time 45m; perform "make test"
 %bcond_with	gcov		# Enable Code coverage reporting
@@ -136,8 +136,8 @@
 License:	PHP
 Group:		Libraries
 #Source0:	http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-Source0:	http://downloads.php.net/stas/%{name}-%{version}alpha3.tar.bz2
-# Source0-md5:	68f277b9be92e51931ab1d705e7c6bde
+Source0:	http://downloads.php.net/stas/%{name}-%{version}beta2.tar.bz2
+# Source0-md5:	51c6e9f1d83f94a323db4c4d5e65e421
 Source2:	%{name}-mod_%{name}.conf
 Source3:	%{name}-cgi-fcgi.ini
 Source4:	%{name}-apache.ini
@@ -201,12 +201,12 @@
 Patch51:	spl-shared.patch
 Patch52:	pcre-shared.patch
 Patch53:	fix-test-run.patch
-Patch54:	mysqlnd-shared.patch
+#Patch54:	mysqlnd-shared.patch # shared build supported upstream
 Patch55:	bug-52078-fileinode.patch
-Patch57:	bug-52448.patch
+#Patch57:	bug-52448.patch # outdated
 Patch59:	%{name}-systzdata.patch
 Patch60:	%{name}-oracle-instantclient.patch
-Patch61:	%{name}-krb5-ac.patch
+#Patch61:	%{name}-krb5-ac.patch # not needed on 5.4 anymore
 Patch62:	mcrypt-libs.patch
 Patch63:	%{name}-mysql-nowarning.patch
 #Patch64:	%{name}-m4.patch # not needed on 5.4 branch
@@ -1516,6 +1516,7 @@
 URL:		http://www.php.net/manual/en/book.snmp.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-sockets = %{epoch}:%{version}-%{release}
+Requires:	%{name}-spl = %{epoch}:%{version}-%{release}
 Provides:	php(snmp)
 
 %description snmp
@@ -1851,9 +1852,9 @@
 Moduł PHP umożliwiający używanie kompresji zlib.
 
 %prep
-%setup -q -n %{name}-%{version}alpha3
+%setup -q -n %{name}-%{version}beta2
 # prep for suhosin patch
-%{__sed} -i -e 's,\r$,,' Zend/Zend.dsp Zend/ZendTS.dsp
+%undos Zend/Zend.dsp Zend/ZendTS.dsp
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -1908,13 +1909,10 @@
 %patch51 -p1
 %patch52 -p1
 %patch53 -p1
-%patch54 -p1
 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
 %patch55 -p1
-%patch57 -p1
 %patch59 -p1
 %patch60 -p1
-%patch61 -p1
 %patch62 -p1
 %patch63 -p1
 %{?with_system_libzip:%patch65 -p1}
@@ -3283,6 +3281,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.945.2.4  2011/11/06 11:39:19  glen
+- up to php 5.4.0beta2
+  - snmp depends now on spl ext
+
 Revision 1.945.2.3  2011/11/05 20:40:03  glen
 - merge changes from HEAD up to r1.966
 
================================================================

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



More information about the pld-cvs-commit mailing list