diff options
| author | Remi Collet <remi@remirepo.net> | 2021-06-10 10:20:40 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2021-06-10 10:20:40 +0200 |
| commit | 5bf8b4b9e314d9afaef176bb4f7ddfbc72108f7c (patch) | |
| tree | 2397b68d2950f10095e2c96a61fce16d03de2723 /php-pecl-msgpack.spec | |
| parent | 85995f7dc1600b57ffc26d6ecddaf5cf805456c0 (diff) | |
add patch for test suite with PHP 8.1 from
https://github.com/msgpack/msgpack-php/pull/156
Diffstat (limited to 'php-pecl-msgpack.spec')
| -rw-r--r-- | php-pecl-msgpack.spec | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec index 76e42d5..75e4a1f 100644 --- a/php-pecl-msgpack.spec +++ b/php-pecl-msgpack.spec @@ -42,13 +42,15 @@ URL: https://pecl.php.net/package/msgpack Release: 0.6.%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz %else -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz %endif +Patch0: %{pecl_name}-php81.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc -BuildRequires: %{?scl_prefix}php-devel >= 7 +BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-pear %if %{with_msgpack} BuildRequires: msgpack-devel @@ -128,6 +130,8 @@ mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS +%patch0 -p1 + %if %{with_msgpack} # use system library rm -rf msgpack @@ -215,9 +219,8 @@ cd NTS : Upstream test suite for NTS extension TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=0 \ -%{__php} -n run-tests.php --show-diff +REPORT_EXIT_STATUS=1 \ +%{__php} -n run-tests.php -q --show-diff %if %{with_zts} cd ../ZTS @@ -229,9 +232,8 @@ cd ../ZTS : Upstream test suite for ZTS extension TEST_PHP_EXECUTABLE=%{__ztsphp} \ TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=0 \ -%{__ztsphp} -n run-tests.php --show-diff +REPORT_EXIT_STATUS=1 \ +%{__ztsphp} -n run-tests.php -q --show-diff %endif @@ -279,6 +281,10 @@ fi %changelog +* Thu Jun 10 2021 Remi Collet <remi@remirepo.net> - 2.1.2-3 +- add patch for test suite with PHP 8.1 from + https://github.com/msgpack/msgpack-php/pull/156 + * Wed Apr 28 2021 Remi Collet <remi@remirepo.net> - 2.1.2-2 - F34 rebuild for https://github.com/remicollet/remirepo/issues/174 |