X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php.spec;h=a6e9d5a196be00b98260d47b5845932857d4d7d8;hb=11ec655;hp=2b28ac65412da4d9251bb9ea1882e33ffabd7ddc;hpb=f7042e91e68a0e9ce4018daa61be4538689cdf78;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index 2b28ac6..a6e9d5a 100644
--- a/php.spec
+++ b/php.spec
@@ -149,7 +149,7 @@ 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.1.11
+Version:	7.1.14
 Release:	1
 Epoch:		4
 # All files licensed under PHP version 3.01, except
@@ -158,7 +158,7 @@ Epoch:		4
 License:	PHP 3.01 and Zend and BSD
 Group:		Libraries
 Source0:	https://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	bbf4dfe4f501143a1763eb86b6a0a454
+# Source0-md5:	6c00d9c11db8d05bb86d1244ca9098d0
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
@@ -306,7 +306,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # Extension versions
 %define		bz2ver		1.0
-%define		enchantver	1.1.0
+%define		enchantver	%{version}
 %define		fileinfover	1.0.5
 %define		hashver		1.0
 %define		intlver		1.1.0
@@ -624,6 +624,7 @@ Obsoletes:	php54-devel
 Obsoletes:	php55-devel
 Obsoletes:	php56-devel
 Obsoletes:	php70-devel
+Obsoletes:	php72-devel
 
 %description devel
 The php-devel package lets you compile dynamic extensions to PHP.
@@ -2162,12 +2163,12 @@ 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
-#	: Error: Upstream Sqlite3 version is now ${ver}, expecting %{sqlite3ver}.
-#	: Update the sqlite3ver macro and rebuild.
-#	exit 1
-#fi
+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
+fi
 ver=$(sed -n '/#define PHP_ZIP_VERSION /{s/.* "//;s/".*$//;p}' ext/zip/php_zip.h)
 if test "$ver" != "%{zipver}"; then
 	: Error: Upstream ZIP version is now ${ver}, expecting %{zipver}.
@@ -2192,10 +2193,8 @@ if test "$ver" != "%{bz2ver}"; then
 	: Update the bz2ver macro and rebuild.
 	exit 1
 fi
-ver=$(sed -n '/#define PHP_ENCHANT_VERSION /{s/.* "//;s/".*$//;p}' ext/enchant/php_enchant.h)
-if test "$ver" != "%{enchantver}"; then
-	: Error: Upstream Enchant version is now ${ver}, expecting %{enchantver}.
-	: Update the enchantver macro and rebuild.
+ver=$(awk '/#define PHP_ENCHANT_VERSION/ {print $3}' ext/enchant/php_enchant.h | xargs)
+if test "$ver" != "PHP_VERSION"; then
 	exit 1
 fi
 ver=$(awk '/#define PHP_HASH_VERSION/ {print $3}' ext/hash/php_hash.h | xargs)