From 566feeb30a549424dfad3f09e25c79fb4b4c3088 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 5 Mar 2021 06:58:06 +0100
Subject: update to 0.56.0

---
 php-pecl-datadog-trace.spec | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

(limited to 'php-pecl-datadog-trace.spec')

diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec
index e278fa4..ac727b2 100644
--- a/php-pecl-datadog-trace.spec
+++ b/php-pecl-datadog-trace.spec
@@ -26,7 +26,7 @@
 
 Summary:        APM and distributed tracing for PHP
 Name:           %{?sub_prefix}php-pecl-datadog-trace
-Version:        0.54.0
+Version:        0.56.0
 Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 # extension is dual-licensed under Apache 2.0 or BSD3.
 # mpack is MIT
@@ -59,6 +59,9 @@ BuildRequires:  %{?scl_prefix}php-posix
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
 %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
+%if "%{php_version}" > "8.0"
+Requires:       %{?scl_prefix}php-curl%{?_isa}
+%endif
 
 Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
@@ -183,34 +186,43 @@ rm ?TS/tests/ext/sandbox/memory_limit_graceful_bailout.phpt
 %if "%{php_version}" > "8.0"
 rm ?TS/tests/ext/sandbox/fatal_errors_are_tracked_005.phpt
 %endif
+# XFAIL
+rm ?TS/tests/ext/sandbox/hook_function/01.phpt
+rm ?TS/tests/ext/sandbox/hook_method/01.phpt
 
+# DEP for ext dependencies, MOD for ext used in tests
+DEP=""
 MOD="-n -d ddtrace.request_init_hook="
+%if "%{php_version}" > "8.0"
+[ -f %{php_extdir}/curl.so ]  && DEP="$DEP -d extension=curl.so"
+%else
 [ -f %{php_extdir}/curl.so ]  && MOD="$MOD -d extension=curl.so"
+%endif
 [ -f %{php_extdir}/json.so ]  && MOD="$MOD -d extension=json.so"
 [ -f %{php_extdir}/posix.so ] && MOD="$MOD -d extension=posix.so"
 
 cd NTS
 : Minimal load test for NTS extension
-%{__php} --no-php-ini \
+%{__php} --no-php-ini $DEP \
     --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
-    --modules | grep -i %{pecl_name}
+    --modules | grep -i '^%{pecl_name}$'
 
 : Upstream test suite for NTS extension
 TEST_PHP_EXECUTABLE=%{_bindir}/php \
-TEST_PHP_ARGS="$MOD -d extension=$PWD/modules/%{pecl_name}.so" \
+TEST_PHP_ARGS="$DEP $MOD -d extension=$PWD/modules/%{pecl_name}.so" \
 REPORT_EXIT_STATUS=1 \
 %{_bindir}/php -n run-tests.php -q --show-diff
 
 %if %{with_zts}
 cd ../ZTS
 : Minimal load test for ZTS extension
-%{__ztsphp} --no-php-ini \
+%{__ztsphp} --no-php-ini $DEP \
     --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
-    --modules | grep -i %{pecl_name}
+    --modules | grep -i '^%{pecl_name}$'
 
 : Upstream test suite for ZTS extension
 TEST_PHP_EXECUTABLE=%{__ztsphp} \
-TEST_PHP_ARGS="$MOD -d extension=$PWD/modules/%{pecl_name}.so" \
+TEST_PHP_ARGS="$DEP $MOD -d extension=$PWD/modules/%{pecl_name}.so" \
 REPORT_EXIT_STATUS=1 \
 %{__ztsphp} -n run-tests.php -q --show-diff
 %endif
@@ -253,6 +265,14 @@ fi
 
 
 %changelog
+* Fri Mar  5 2021 Remi Collet <remi@remirepo.net> - 0.56.0-1
+- update to 0.56.0
+
+* Fri Feb  5 2021 Remi Collet <remi@remirepo.net> - 0.55.0-1
+- update to 0.55.0
+- open https://github.com/DataDog/dd-trace-php/pull/1144
+  add missing dependency on curl extension for PHP 8
+
 * Thu Jan 21 2021 Remi Collet <remi@remirepo.net> - 0.54.0-1
 - update to 0.54.0
 
-- 
cgit