From be3673ba9122e3acd92e1c2c807402292ac7a4fb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 Sep 2021 09:32:39 +0200 Subject: rebuild with workaround for https://github.com/libvips/php-vips-ext/issues/43 --- .gitignore | 2 ++ php-pecl-vips.spec | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 1ab5c4f..01f0400 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ +clog package-*.xml *.tgz +*.tar.bz2 *.tar.gz *.tar.xz *.tar.xz.asc diff --git a/php-pecl-vips.spec b/php-pecl-vips.spec index 47f5d30..40ca561 100644 --- a/php-pecl-vips.spec +++ b/php-pecl-vips.spec @@ -22,7 +22,7 @@ Summary: PHP extension for interfacing with libvips Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.0.12 -Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 5%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages URL: https://pecl.php.net/package/%{pecl_name} @@ -30,7 +30,7 @@ Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz BuildRequires: %{?dtsprefix}gcc BuildRequires: make -BuildRequires: %{?scl_prefix}php-devel > 7 +BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-pear # ensure latest version is used (upstream requires 8.2) BuildRequires: pkgconfig(vips) >= 8.10 @@ -63,6 +63,9 @@ Obsoletes: php74-pecl-%{pecl_name} <= %{version} %if "%{php_version}" > "8.0" Obsoletes: php80-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "8.1" +Obsoletes: php81-pecl-%{pecl_name} <= %{version} +%endif %endif @@ -176,9 +179,6 @@ fi # Need investigation rm ?TS/tests/029.phpt -# Workaround for https://github.com/libvips/php-vips-ext/issues/43 -export ZEND_DONT_UNLOAD_MODULES=1 - : Minimal load test for NTS extension cd NTS %{_bindir}/php --no-php-ini \ @@ -225,7 +225,7 @@ REPORT_EXIT_STATUS=1 \ %changelog -* Mon Sep 6 2021 Remi Collet - 1.0.12-4 +* Mon Sep 6 2021 Remi Collet - 1.0.12-5 - rebuild with workaround for https://github.com/libvips/php-vips-ext/issues/43 * Wed Sep 30 2020 Remi Collet - 1.0.12-3 -- cgit