X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php.spec;h=4f270f6c5ec3c70e41931c488e8245c032c566f8;hb=cf803f4380625807621480d31ea3fda3a7e703d8;hp=11db9539a9322e9c815b19c953e3dfe8a8bd02e7;hpb=4cc8c9649a1f9ce5d260566ca8efe088b6507137;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index 11db953..4f270f6 100644
--- a/php.spec
+++ b/php.spec
@@ -142,8 +142,8 @@ Summary(pt_BR.UTF-8):	A linguagem de script PHP
 Summary(ru.UTF-8):	PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
-Version:	7.0.15
-Release:	1.1
+Version:	7.0.25
+Release:	1
 Epoch:		4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -151,7 +151,7 @@ Epoch:		4
 License:	PHP 3.01 and Zend and BSD
 Group:		Libraries
 Source0:	http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	dca23412f3e3b3987e582091b751925d
+# Source0-md5:	93e84a3997a411edd27abd3f148f6794
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
@@ -163,7 +163,6 @@ Source13:	dep-tests.sh
 Source14:	skip-tests.sh
 Patch0:		%{orgname}-shared.patch
 Patch1:		%{orgname}-tld.patch
-Patch2:		%{orgname}-mail.patch
 Patch3:		%{orgname}-link-libs.patch
 Patch4:		intl-stdc++.patch
 Patch5:		%{orgname}-filter-shared.patch
@@ -193,8 +192,6 @@ Patch41:	%{orgname}-fpm-config.patch
 Patch42:	%{orgname}-fpm-shared.patch
 Patch43:	%{orgname}-silent-session-cleanup.patch
 Patch44:	%{orgname}-include_path.patch
-Patch45:	%{orgname}-imap-annotations.patch
-Patch46:	%{orgname}-imap-myrights.patch
 Patch47:	suhosin.patch
 Patch50:	extension-shared-optional-dep.patch
 Patch51:	spl-shared.patch
@@ -202,13 +199,10 @@ Patch52:	pcre-shared.patch
 Patch53:	fix-test-run.patch
 Patch55:	bug-52078-fileinode.patch
 Patch59:	%{orgname}-systzdata.patch
-Patch60:	%{orgname}-oracle-instantclient.patch
 Patch62:	mcrypt-libs.patch
 Patch65:	system-libzip.patch
 Patch66:	php-db.patch
 Patch67:	mysql-lib-ver-mismatch.patch
-# https://bugs.php.net/bug.php?id=68344
-Patch68:	php-mysql-ssl-context.patch
 Patch69:	fpm-conf-split.patch
 Patch70:	mysqlnd-ssl.patch
 Patch71:	libdb-info.patch
@@ -289,8 +283,8 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		php_sysconfdir		/etc/%{name}
 %define		php_extensiondir	%{_libdir}/%{name}
-%define		php_datadir	/usr/share/%{name}
-%define		_sysconfdir			%{php_sysconfdir}
+%define		php_datadir		/usr/share/php/%{name}
+%define		_sysconfdir		%{php_sysconfdir}
 
 # must be in sync with source. extra check ensuring that it is so is done in %%build
 %define		php_api_version		20151012
@@ -1930,7 +1924,6 @@ Moduł PHP umożliwiający używanie kompresji zlib.
 cp -p php.ini-production php.ini
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1
 %patch3 -p1
 %patch5 -p1
 %patch6 -p1
@@ -1960,8 +1953,6 @@ cp -p php.ini-production php.ini
 %endif
 %patch43 -p1
 %patch44 -p1
-#%patch45 -p1 # imap annotations. fixme
-#%patch46 -p1 # imap myrights. fixme
 %if %{with suhosin}
 %patch47 -p1
 %endif
@@ -1972,12 +1963,10 @@ cp -p php.ini-production php.ini
 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
 %patch55 -p1
 %patch59 -p1
-%patch60 -p1
 %patch62 -p1
 %{?with_system_libzip:%patch65 -p1}
 %patch66 -p1
 %patch67 -p1
-#%patch68 -p1
 %patch70 -p1
 %patch71 -p1
 %patch72 -p1
@@ -2121,8 +2110,8 @@ if test "$ver" != "%{pharver}"; then
 	: Update the pharver macro and rebuild.
 	exit 1
 fi
-ver=$(sed -n '/#define PHP_SQLITE3_VERSION/{s/.* "//;s/".*$//;p}' ext/sqlite3/php_sqlite3.h)
-if test "$ver" != "%{sqlite3ver}"; then
+ver=$(awk '/#define PHP_SQLITE3_VERSION/ {print $3}' ext/sqlite3/php_sqlite3.h | xargs)
+if test "$ver" != "PHP_VERSION"; then
 	: Error: Upstream Sqlite3 version is now ${ver}, expecting %{sqlite3ver}.
 	: Update the sqlite3ver macro and rebuild.
 	exit 1
@@ -2937,6 +2926,7 @@ fi
 %dir %{_sysconfdir}/conf.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini
 %attr(755,root,root) %{_libdir}/libphp_common-*.so
+%dir %{php_datadir}
 %dir %{php_extensiondir}
 
 %doc ext/session/mod_files.sh