diff options
| -rw-r--r-- | php-pecl-imagick.spec | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec index 32467ee..018c7b9 100644 --- a/php-pecl-imagick.spec +++ b/php-pecl-imagick.spec @@ -51,7 +51,7 @@ Summary: Extension to create and modify images using ImageMagick 7 Name: %{?scl_prefix}php-pecl-imagick-im7 %endif Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1.1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz License: PHP-3.01 URL: https://pecl.php.net/package/imagick @@ -274,6 +274,9 @@ rm tests/244_Tutorial_psychedelicFontGif_basic.phpt rm tests/073_Imagick_forwardFourierTransformImage_basic.phpt rm tests/086_Imagick_forwardFourierTransformImage_basic.phpt rm tests/151_Imagick_subImageMatch_basic.phpt +# change in 7.1.2 +# see https://github.com/Imagick/imagick/issues/737 +rm tests/024-ispixelsimilar.phpt : simple module load test for NTS extension %{__php} --no-php-ini \ @@ -282,11 +285,12 @@ rm tests/151_Imagick_subImageMatch_basic.phpt --modules | grep '^%{pecl_name}$' %if %{with tests} +ret=0 : upstream test suite for NTS extension TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ %if "%{php_version}" > "7.4" -%{__php} -n run-tests.php -q --show-diff %{?_smp_mflags} +%{__php} -n run-tests.php -q --show-diff %{?_smp_mflags} || ret=1 %else %{__php} -n run-tests.php -q --show-diff %endif @@ -297,8 +301,8 @@ if [ -f %{php_extdir}/%{pecl_name}.so ]; then then : upstream test suite for extension built with previous version %{__php} --ri imagick - TEST_PHP_ARGS="-n -d extension=%{pecl_name}" \ - %{__php} -n run-tests.php -q --show-diff %{?_smp_mflags} + TEST_PHP_ARGS="-n -d imagick.skip_version_check=1 -d extension=%{pecl_name}" \ + %{__php} -n run-tests.php -q --show-diff %{?_smp_mflags} || ret=1 fi fi %endif @@ -311,6 +315,8 @@ fi --modules | grep '^%{pecl_name}$' %endif +exit $ret + %files %license %{sources}/LICENSE @@ -337,6 +343,10 @@ fi %changelog +* Tue Jul 15 2025 Remi Collet <remi@remirepo.net> - 3.8.0-1.1 +- ignore 1 test failing with IM 7.1.2 reported as + https://github.com/Imagick/imagick/issues/737 + * Fri Apr 11 2025 Remi Collet <remi@remirepo.net> - 3.8.0-1 - update to 3.8.0 |