From 3e7ae526a1407179e8820517193a19db3d892d40 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sat, 28 Oct 2017 16:56:36 +0300 Subject: [PATCH] ext-enchant version matches php version now --- php.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/php.spec b/php.spec index f7b8730..7d757fe 100644 --- a/php.spec +++ b/php.spec @@ -154,7 +154,7 @@ Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирова Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} Version: 7.2.0 -Release: 0.22 +Release: 0.23 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -311,7 +311,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 @@ -2195,10 +2195,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) -- 2.43.0