From 6760c41e3f22130f57ed983f57cb1cf262f5b9ca Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 11 Jun 2021 12:36:20 +0200 Subject: add patch for test suite with PHP 8.1 from https://github.com/vitoc/gmagick/pull/54 --- php-pecl-gmagick.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'php-pecl-gmagick.spec') diff --git a/php-pecl-gmagick.spec b/php-pecl-gmagick.spec index 5ce169f..529d63f 100644 --- a/php-pecl-gmagick.spec +++ b/php-pecl-gmagick.spec @@ -25,11 +25,13 @@ Summary: Provides a wrapper to the GraphicsMagick library Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz +Patch0: %{pecl_name}-php81.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-pear @@ -63,6 +65,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 @@ -83,6 +88,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 + extver=$(sed -n '/#define PHP_GMAGICK_VERSION/{s/.* "//;s/".*$//;p}' php_gmagick.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}. @@ -223,6 +230,10 @@ export TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" %changelog +* Fri Jun 11 2021 Remi Collet - 2.0.6~RC1-2 +- add patch for test suite with PHP 8.1 from + https://github.com/vitoc/gmagick/pull/54 + * Fri Feb 12 2021 Remi Collet - 2.0.6~RC1-1 - Update to 2.0.6RC1 -- cgit