[packages/php/PHP_7_0] ext-enchant version matches php version now

[glen]

commit 94c580294355daa96185b736d1ae851c73e3f3a8
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Sat Oct 28 16:56:36 2017 +0300

    ext-enchant version matches php version now

 php.spec | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/php.spec b/php.spec
index 872baac..949ae88 100644
--- a/php.spec
+++ b/php.spec
@@ -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
@@ -2178,10 +2178,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)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/94c580294355daa96185b736d1ae851c73e3f3a8