From ae850eb0c0038ce005e9f1326186a6b37c22f64a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Jun 2021 15:58:04 +0200 Subject: add fix for test suite with PHP 8.1 from https://github.com/php/pecl-file_formats-yaml/pull/59 --- php-pecl-yaml.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'php-pecl-yaml.spec') diff --git a/php-pecl-yaml.spec b/php-pecl-yaml.spec index 9103996..87f3ce6 100644 --- a/php-pecl-yaml.spec +++ b/php-pecl-yaml.spec @@ -24,12 +24,14 @@ Summary: PHP Bindings for yaml Name: %{?sub_prefix}php-pecl-yaml Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: MIT URL: https://pecl.php.net/package/yaml 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-devel >= 7.1 @@ -71,6 +73,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 @@ -93,6 +98,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 + # Check upstream version (often broken) extver=$(sed -n '/#define PHP_YAML_VERSION/{s/.* "//;s/".*$//;p}' php_yaml.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then @@ -240,6 +247,10 @@ fi %changelog +* Wed Jun 9 2021 Remi Collet - 2.2.1-5 +- add fix for test suite with PHP 8.1 from + https://github.com/php/pecl-file_formats-yaml/pull/59 + * Thu Apr 29 2021 Remi Collet - 2.2.1-4 - F34 rebuild for https://github.com/remicollet/remirepo/issues/174 -- cgit