From 33968e12fc2c455056f41a5748117c7b37c77217 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Jul 2020 08:48:18 +0200 Subject: update to 0.47.0 open https://github.com/DataDog/dd-trace-php/pull/952 improve CGI usage in test suite open https://github.com/DataDog/dd-trace-php/issues/953 missing files in 0.47.0 archive --- php-pecl-datadog-trace.spec | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'php-pecl-datadog-trace.spec') diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec index 0d1a4c8..2554b3e 100644 --- a/php-pecl-datadog-trace.spec +++ b/php-pecl-datadog-trace.spec @@ -34,7 +34,7 @@ Summary: APM and distributed tracing for PHP Name: %{?sub_prefix}php-pecl-datadog-trace -Version: 0.46.0 +Version: 0.47.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 @@ -42,7 +42,14 @@ License: (ASL 2.0 or BSD) and MIT URL: https://pecl.php.net/package/%{proj_name} Source0: https://pecl.php.net/get/%{proj_name}-%{version}.tgz -Source1: https://raw.githubusercontent.com/DataDog/dd-trace-php/0.46.0/src/ext/php5_4/handlers_internal.c +Source1: https://raw.githubusercontent.com/DataDog/dd-trace-php/0.47.0/src/ext/php5/engine_api.c +Source2: https://raw.githubusercontent.com/DataDog/dd-trace-php/0.47.0/src/ext/php5/engine_api.h +Source3: https://raw.githubusercontent.com/DataDog/dd-trace-php/0.47.0/src/ext/php5/handlers_curl.c + +Patch0: https://patch-diff.githubusercontent.com/raw/DataDog/dd-trace-php/pull/952.patch + +# ddtrace only supports 64-bit platforms +ExcludeArch: %{ix86} %{arm} %if 0%{?rhel} == 6 BuildRequires: devtoolset-6-toolchain @@ -57,8 +64,8 @@ BuildRequires: %{?scl_prefix}php-curl BuildRequires: %{?scl_prefix}php-json BuildRequires: %{?scl_prefix}php-posix #BuildRequires: gdb -#BuildRequires: %{?scl_prefix}php-debuginfo -#BuildRequires: %{?scl_prefix}php-debugsource +#BuildRequires: %%{?scl_prefix}php-debuginfo +#BuildRequires: %%{?scl_prefix}php-debugsource Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} @@ -112,7 +119,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -cp %{SOURCE1} src/ext/php5_4/handlers_internal.c +%patch0 -p1 +cp %{SOURCE1} %{SOURCE2} %{SOURCE3} src/ext/php5/ cp src/ext/mpack/LICENSE LICENSE.mpack : Sanity check, really often broken extver=$(sed -n '/#define PHP_DDTRACE_VERSION /{s/.* "//;s/".*$//;p}' src/ext/version.h) @@ -192,21 +200,6 @@ done # Erratic results rm ?TS/tests/ext/segfault_backtrace_*.phpt rm ?TS/tests/ext/sandbox/memory_limit_graceful_bailout.phpt -%if %{__isa_bits} < 64 -# see https://github.com/DataDog/dd-trace-php/issues/394 -rm ?TS/tests/ext/circuit_breaker_info.phpt -rm ?TS/tests/ext/sandbox/dd_trace_function_complex.phpt -rm ?TS/tests/ext/sandbox/dd_trace_function_internal.phpt -rm ?TS/tests/ext/sandbox/dd_trace_function_userland.phpt -rm ?TS/tests/ext/sandbox/dd_trace_method.phpt -rm ?TS/tests/ext/sandbox/dd_trace_method_works_with_dd_trace.phpt -rm ?TS/tests/ext/sandbox/errors_are_flagged_from_userland.phpt -rm ?TS/tests/ext/sandbox/exceptions_and_errors_are_ignored_in_tracing_closure.phpt -rm ?TS/tests/ext/sandbox/dd_trace_set_trace_id.phpt -rm ?TS/tests/ext/sandbox-prehook/dd_trace_method.phpt -rm ?TS/tests/ext/sandbox-prehook/dd_trace_method_works_with_dd_trace.phpt -%endif - MOD="-n" [ -f %{php_extdir}/curl.so ] && MOD="$MOD -d extension=curl.so" @@ -275,6 +268,13 @@ fi %changelog +* Thu Jul 9 2020 Remi Collet - 0.47.0-1 +- update to 0.47.0 +- open https://github.com/DataDog/dd-trace-php/pull/952 + improve CGI usage in test suite +- open https://github.com/DataDog/dd-trace-php/issues/953 + missing files in 0.47.0 archive + * Wed Jun 3 2020 Remi Collet - 0.46.0-1 - update to 0.46.0 - open https://github.com/DataDog/dd-trace-php/issues/912 -- cgit