From 237943ae61d4a4685f794fab3940eeafbf3687af Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 23 Jul 2016 12:45:52 +0200 Subject: php-pecl-msgpack: ignore more tests --- php-pecl-msgpack-php7.spec | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/php-pecl-msgpack-php7.spec b/php-pecl-msgpack-php7.spec index fea863e..ef5ef50 100644 --- a/php-pecl-msgpack-php7.spec +++ b/php-pecl-msgpack-php7.spec @@ -36,7 +36,7 @@ Version: 2.0.1 Release: 0.1.%{gh_date}git%{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: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz %endif License: BSD @@ -57,13 +57,14 @@ Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} -Provides: %{?scl_prefix}php-%{pecl_name} = %{version} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} +Provides: %{?scl_prefix}php-%{pecl_name} = %{version} +Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} - +%if "%{?scl_prefix}" != "%{?sub_prefix}" +Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} +%endif %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} # Other third party repo stuff Obsoletes: php53-pecl-%{pecl_name} <= %{version} @@ -208,9 +209,7 @@ done %check # Known by upstream as failed test (travis result) rm */tests/041.phpt -%ifnarch x86_64 -rm */tests/{040,040b,040d}.phpt -%endif +rm */tests/040*.phpt cd NTS : Minimal load test for NTS extension @@ -285,6 +284,9 @@ fi %changelog +* Sat Jul 23 2016 Remi Collet - 2.0.1-3 +- ignore more tests with 7.1 + * Sat Jun 11 2016 Remi Collet - 2.0.1-2 - add patch for PHP 7.1 open https://github.com/msgpack/msgpack-php/pull/87 -- cgit