X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php.spec;h=87209865b8d60ae58121021ae61478d8de6610bd;hb=3bd98eb;hp=a50c838145c8f1f6aa5cdc7ab28ddc5afe25cd16;hpb=04b32545537bba7a577a299668d42f359e523b8b;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index a50c838..8720986 100644
--- a/php.spec
+++ b/php.spec
@@ -138,7 +138,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine	with_filter
 %endif
 
-%define		rel	22
+%define		rel	31
 %define		orgname	php
 %define		ver_suffix 54
 %define		php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -184,7 +184,6 @@ Patch11:	embed.patch
 Patch12:	http://ilia.ws/patch/type_hint_53_v2.txt
 %endif
 Patch14:	%{orgname}-no_pear_install.patch
-#Patch15:	%{orgname}-zlib.patch # no longer needed?
 Patch17:	%{orgname}-readline.patch
 Patch18:	%{orgname}-nohttpd.patch
 Patch19:	%{orgname}-gd_imagerotate_enable.patch
@@ -198,7 +197,6 @@ Patch26:	%{orgname}-pear.patch
 Patch27:	%{orgname}-config-dir.patch
 Patch29:	%{orgname}-fcgi-graceful.patch
 Patch31:	%{orgname}-fcgi-error_log-no-newlines.patch
-#Patch32:	%{orgname}-curl-limit-speed.patch # applied upstream
 Patch34:	%{orgname}-libtool.patch
 Patch35:	%{orgname}-tds.patch
 Patch36:	%{orgname}-mysql-charsetphpini.patch
@@ -212,20 +210,15 @@ Patch44:	%{orgname}-include_path.patch
 Patch45:	%{orgname}-imap-annotations.patch
 Patch46:	%{orgname}-imap-myrights.patch
 Patch47:	suhosin.patch
-#Patch49:	%{orgname}-m4-divert.patch # no longer needed, upstream supports new ac
 Patch50:	extension-shared-optional-dep.patch
 Patch51:	spl-shared.patch
 Patch52:	pcre-shared.patch
 Patch53:	fix-test-run.patch
-#Patch54:	mysqlnd-shared.patch # shared build supported upstream
 Patch55:	bug-52078-fileinode.patch
-#Patch57:	bug-52448.patch # outdated
 Patch59:	%{orgname}-systzdata.patch
 Patch60:	%{orgname}-oracle-instantclient.patch
-#Patch61:	%{orgname}-krb5-ac.patch # not needed on 5.4 anymore
 Patch62:	mcrypt-libs.patch
 Patch63:	%{orgname}-mysql-nowarning.patch
-#Patch64:	%{orgname}-m4.patch # not needed on 5.4 branch
 Patch65:	system-libzip.patch
 Patch66:	php-db.patch
 Patch67:	mysql-lib-ver-mismatch.patch
@@ -234,6 +227,7 @@ Patch70:	libvpx2.patch
 Patch71:	zend_operators_from_5.5.patch
 Patch72:	mysqli-err.patch
 Patch73:	openssl.patch
+Patch74:	php-icu64.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}
@@ -503,7 +497,18 @@ Summary:	/usr/bin/php symlink
 Summary(pl.UTF-8):	Dowiązanie symboliczne /usr/bin/php
 Group:		Development/Languages/PHP
 Requires:	%{name}-cli = %{epoch}:%{version}-%{release}
-Obsoletes:	/usr/bin/php
+Obsoletes:	php-program < 4:5.3.28-7
+Obsoletes:	php4-program
+Obsoletes:	php52-program
+Obsoletes:	php53-program
+Obsoletes:	php55-program
+Obsoletes:	php56-program
+Obsoletes:	php70-program
+Obsoletes:	php71-program
+Obsoletes:	php72-program
+Obsoletes:	php73-program
+Obsoletes:	php74-program
+Obsoletes:	php80-program
 
 %description program
 Package providing /usr/bin/php symlink to PHP CLI.
@@ -1979,6 +1984,10 @@ cp -p php.ini-production php.ini
 %endif
 %patch72 -p1
 %patch73 -p1
+%patch74 -p1
+
+sed -E -i -e '1s,#!\s*/usr/bin/env\s+(.*),#!%{__bindir}\1,' \
+      run-tests.php
 
 %{__sed} -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
 
@@ -2203,6 +2212,7 @@ for sapi in $sapis; do
 	esac
 
 	%configure \
+	CFLAGS="%{rpmcflags} -DOPENSSL_NO_SSL2=1 -DOPENSSL_NO_SSL3=1" \
 	EXTRA_LDFLAGS="%{rpmldflags}" \
 	$sapi_args \
 %if "%{!?configure_cache:0}%{?configure_cache}" == "0"