X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php.spec;fp=php.spec;h=72b05fdfa877fee532a9f90681a28eafa1ec8f8b;hb=ac066637c0bddcfacd811c1583c42f871437d3a6;hp=5e71a8c38d804583980484195b33e237f47a6611;hpb=c971db4fbdd0131f84fb77717fb2ea727c612abd;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index 5e71a8c..72b05fd 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
@@ -1964,7 +1964,7 @@ cp -p php.ini-production php.ini
 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
 %patch55 -p1
 %patch59 -p1
-%patch60 -p1
+#%patch60 -p1
 %patch62 -p1
 %{?with_system_libzip:%patch65 -p1}
 %patch66 -p1
@@ -2112,8 +2112,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