X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php.spec;h=7c07382c8fed9ce25a414719f2ea7f40defce7c8;hb=6a437dd3aa83647d04e974010fc1daf27c4a8bd2;hp=709a22f9da913723742677fda184bd5afe5b3569;hpb=38b58f6c7e6b84164bfe453c88522cdb00df6a88;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index 709a22f..7c07382 100644
--- a/php.spec
+++ b/php.spec
@@ -42,7 +42,8 @@
 # Reflection
 #
 # Conditional build:
-%bcond_without	default_php	# use this PHP as default PHP in distro
+
+%bcond_with	default_php	# use this PHP as default PHP in distro
 %bcond_with	interbase_inst	# use InterBase install., not Firebird	(BR: proprietary libs)
 %bcond_with	oci8		# with Oracle oci8 extension module	(BR: proprietary libs)
 %bcond_with	instantclient	# build Oracle oci8 extension module against oracle-instantclient package
@@ -80,7 +81,7 @@
 %bcond_without	webp		# Without WebP support in GD extension (imagecreatefromwebp)
 %bcond_without	wddx		# without WDDX extension module
 %bcond_without	xmlrpc		# without XML-RPC extension module
-%bcond_without	apache1		# disable building Apache 1.3.x SAPI
+%bcond_with	apache1		# disable building Apache 1.3.x SAPI
 %bcond_without	apache2		# disable building Apache 2.x SAPI
 %bcond_with	zts		# Zend Thread Safety
 %bcond_without	cgi		# disable CGI/FCGI SAPI
@@ -139,13 +140,13 @@ Summary(pt_BR.UTF-8):	A linguagem de script PHP
 Summary(ru.UTF-8):	PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
-Version:	5.5.1
+Version:	5.5.38
 Release:	%{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
 Epoch:		4
 License:	PHP
 Group:		Libraries
 Source0:	http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	e6520ba8f86e03451f1e9226ca2be681
+# Source0-md5:	312244a0eecad602a1555ed2434e223f
 Source2:	%{orgname}-mod_%{orgname}.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
@@ -165,7 +166,6 @@ Patch4:		%{orgname}-libpq_fs_h_path.patch
 Patch5:		%{orgname}-filter-shared.patch
 Patch6:		%{orgname}-build_modules.patch
 Patch7:		%{orgname}-sapi-ini-file.patch
-Patch8:		%{orgname}-config-file-scan-dir.patch
 Patch9:		%{orgname}-sh.patch
 Patch10:	%{orgname}-ini.patch
 Patch11:	embed.patch
@@ -311,12 +311,12 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # Extension versions
 %define		bz2ver		1.0
 %define		enchantver	1.1.0
-%define		fileinfover	1.0.5-dev
+%define		fileinfover	1.0.5
 %define		hashver		1.0
 %define		intlver		1.1.0
 %define		jsonver		1.2.1
-%define		opcachever	7.0.2-dev
-%define		pharver		2.0.1
+%define		opcachever	7.0.6-dev
+%define		pharver		2.0.2
 %define		sqlite3ver	0.7-dev
 %define		zipver		1.11.0
 
@@ -455,7 +455,7 @@ Summary:	PHP as CLI interpreter
 Summary(pl.UTF-8):	PHP jako interpreter działający z linii poleceń
 Group:		Development/Languages/PHP
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Obsoletes:	php-program
+Provides:	php-program
 
 %description cli
 PHP as CLI interpreter.
@@ -563,6 +563,8 @@ Obsoletes:	php-devel
 Obsoletes:	php-pear-devel
 Obsoletes:	php4-devel
 Obsoletes:	php52-devel
+Obsoletes:	php53-devel
+Obsoletes:	php54-devel
 
 %description devel
 The php-devel package lets you compile dynamic extensions to PHP.
@@ -1873,7 +1875,6 @@ Moduł PHP umożliwiający używanie kompresji zlib.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch8 -p1
 %patch7 -p1
 %patch9 -p1
 cp -p php.ini-production php.ini
@@ -2053,7 +2054,7 @@ if test "$ver" != "%{jsonver}"; then
 	: Update the jsonver macro and rebuild.
 	exit 1
 fi
-ver=$(sed -n '/#define ACCELERATOR_VERSION /{s/.* "//;s/".*$//;p}' ext/opcache/ZendAccelerator.h)
+ver=$(sed -n '/#define PHP_ZENDOPCACHE_VERSION /{s/.* "//;s/".*$//;p}' ext/opcache/ZendAccelerator.h)
 if test "$ver" != "%{opcachever}"; then
 	: Error: Upstream Zend Opcachge version is now ${ver}, expecting %{opcachever}.
 	: Update the opcachever macro and rebuild.