From d0695c7da1f64410108fa2a5597ad783b4666c5b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 9 Apr 2019 09:45:40 +0200
Subject: - update to 0.18.0 - open
 https://github.com/DataDog/dd-trace-php/issues/393   missing files in pecl
 archive, and open   https://github.com/DataDog/dd-trace-php/pull/397 - open
 https://github.com/DataDog/dd-trace-php/issues/394   failed test on 32-bit
 build - open https://github.com/DataDog/dd-trace-php/issues/395   build
 failure with old GCC, and open  
 https://github.com/DataDog/dd-trace-php/pull/396

---
 php-pecl-datadog-trace.spec | 50 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 11 deletions(-)

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

diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec
index 8a4ed7b..d503754 100644
--- a/php-pecl-datadog-trace.spec
+++ b/php-pecl-datadog-trace.spec
@@ -34,15 +34,21 @@
 
 Summary:        APM and distributed tracing for PHP
 Name:           %{?sub_prefix}php-pecl-datadog-trace
-Version:        0.17.0
+Version:        0.18.0
 Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        MIT
 URL:            http://pecl.php.net/package/%{proj_name}
 Source0:        http://pecl.php.net/get/%{proj_name}-%{version}.tgz
 
+Source1:        https://raw.githubusercontent.com/DataDog/dd-trace-php/0.18.0/src/ext/mpack/LICENSE
+Source2:        https://raw.githubusercontent.com/DataDog/dd-trace-php/0.18.0/src/ext/mpack/mpack.c
+Source3:        https://raw.githubusercontent.com/DataDog/dd-trace-php/0.18.0/src/ext/mpack/mpack.h
+
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel
 BuildRequires:  %{?scl_prefix}php-pear
+# For tests
+BuildRequires:  %{?scl_prefix}php-json
 
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
@@ -96,6 +102,11 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
+# https://github.com/DataDog/dd-trace-php/issues/393
+mkdir src/ext/mpack
+cp %{SOURCE2} %{SOURCE3} src/ext/mpack
+cp %{SOURCE1} LICENSE.mpack
+
 : Sanity check, really often broken
 extver=$(sed -n '/#define PHP_DDTRACE_VERSION /{s/.* "//;s/".*$//;p}' src/ext/version.h)
 if test "x${extver}" != "x%{version}"; then
@@ -115,16 +126,17 @@ cat << 'EOF' | tee %{ini_name}
 extension=%{pecl_name}.so
 
 ; Configuration
-;ddtrace.disable = 0
+;ddtrace.disable = Off
 ;ddtrace.internal_blacklisted_modules_list = 'ionCube Loader,'
 ;ddtrace.request_init_hook = ''
-;ddtrace.strict_mode = 0
-;ddtrace.log_backtrace = 0
+;ddtrace.strict_mode = Off
+;ddtrace.log_backtrace = Off
 EOF
 
 
 %build
 %{?dtsenable}
+export CFLAGS="%{optflags} -std=c99"
 
 cd NTS
 %{_bindir}/phpize
@@ -167,6 +179,13 @@ done
 
 
 %check
+%if %{__isa_bits} < 64
+rm ?TS/tests/ext/dd_trace_serialize_msgpack.phpt
+%endif
+
+MOD="-n"
+[ -f %{php_extdir}/json.so ] && MOD="$MOD -d extension=json.so"
+
 cd NTS
 : Minimal load test for NTS extension
 %{__php} --no-php-ini \
@@ -175,10 +194,9 @@ cd NTS
 
 : Upstream test suite for NTS extension
 TEST_PHP_EXECUTABLE=%{_bindir}/php \
-TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \
-NO_INTERACTION=1 \
+TEST_PHP_ARGS="$MOD -d extension=$PWD/modules/%{pecl_name}.so" \
 REPORT_EXIT_STATUS=1 \
-%{_bindir}/php -n run-tests.php
+%{_bindir}/php -n run-tests.php -q --show-diff
 
 %if %{with_zts}
 cd ../ZTS
@@ -189,10 +207,9 @@ cd ../ZTS
 
 : Upstream test suite for ZTS extension
 TEST_PHP_EXECUTABLE=%{__ztsphp} \
-TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \
-NO_INTERACTION=1 \
+TEST_PHP_ARGS="$MOD -d extension=$PWD/modules/%{pecl_name}.so" \
 REPORT_EXIT_STATUS=1 \
-%{__ztsphp} -n run-tests.php
+%{__ztsphp} -n run-tests.php -q --show-diff
 %endif
 
 
@@ -218,7 +235,7 @@ fi
 
 %files
 %doc %{pecl_docdir}/%{pecl_name}
-%{?_licensedir:%license NTS/LICENSE}
+%{?_licensedir:%license NTS/LICENSE*}
 
 %{pecl_xmldir}/%{name}.xml
 %config(noreplace) %{php_inidir}/%{ini_name}
@@ -231,6 +248,17 @@ fi
 
 
 %changelog
+* Tue Apr  9 2019 Remi Collet <remi@remirepo.net> - 0.18.0-1
+- update to 0.18.0
+- open https://github.com/DataDog/dd-trace-php/issues/393
+  missing files in pecl archive, and open
+  https://github.com/DataDog/dd-trace-php/pull/397
+- open https://github.com/DataDog/dd-trace-php/issues/394
+  failed test on 32-bit build
+- open https://github.com/DataDog/dd-trace-php/issues/395
+  build failure with old GCC, and open
+  https://github.com/DataDog/dd-trace-php/pull/396
+
 * Wed Mar 27 2019 Remi Collet <remi@remirepo.net> - 0.17.0-1
 - update to 0.17.0 (no change)
 
-- 
cgit