From 27b3eca90b74939eac8b9c6b1c7ef001fa65aa6f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 2 Sep 2020 10:02:38 +0200
Subject: add upstream patch for test suite add patch for PHP 8.0.0beta3 from  
 https://github.com/igbinary/igbinary/pull/284

---
 php-pecl-igbinary.spec | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'php-pecl-igbinary.spec')

diff --git a/php-pecl-igbinary.spec b/php-pecl-igbinary.spec
index f2f63c1..230422b 100644
--- a/php-pecl-igbinary.spec
+++ b/php-pecl-igbinary.spec
@@ -35,12 +35,15 @@ Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
 Release:        0.12.%{gh_date}.%{gh_short}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 Source0:        https://github.com/%{pecl_name}/%{pecl_name}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
 %else
-Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:        2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 Source0:        https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 %endif
 License:        BSD
 URL:            https://pecl.php.net/package/igbinary
 
+Patch0:         igbinary-tests.patch
+Patch1:         https://patch-diff.githubusercontent.com/raw/igbinary/igbinary/pull/284.patch
+
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-pear
 BuildRequires:  %{?scl_prefix}php-devel > 7
@@ -144,6 +147,9 @@ mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
 %{?_licensedir:sed -e '/COPYING/s/role="doc"/role="src"/' -i package.xml}
 
 cd NTS
+%patch0 -p1 -b .up
+%patch1 -p1 -b .pr
+
 # Check version
 subdir="php$(%{__php} -r 'echo (PHP_MAJOR_VERSION < 7 ? 5 : 7);')"
 extver=$(sed -n '/#define PHP_IGBINARY_VERSION/{s/.* "//;s/".*$//;p}' src/$subdir/igbinary.h)
@@ -216,12 +222,6 @@ done
 
 
 %check
-PHPV=$(%{__php} -r 'echo PHP_VERSION_ID;')
-if [ $PHPV -ge 80000 ] ; then
-  # known failure (recursion)
-  rm ?TS/tests/igbinary_{009b,026,026b}.phpt
-fi
-
 MOD=""
 # drop extension load from phpt
 sed -e '/^extension=/d' -i ?TS/tests/*phpt
@@ -308,6 +308,11 @@ fi
 
 
 %changelog
+* Wed Sep  2 2020 Remi Collet <remi@remirepo.net> - 3.1.4-2
+- add upstream patch for test suite
+- add patch for PHP 8.0.0beta3 from
+  https://github.com/igbinary/igbinary/pull/284
+
 * Thu Aug  6 2020 Remi Collet <remi@remirepo.net> - 3.1.4-1
 - update to 3.1.4
 
-- 
cgit