diff options
Diffstat (limited to 'php-pecl-datadog-trace.spec')
| -rw-r--r-- | php-pecl-datadog-trace.spec | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec index d503754..6a3e204 100644 --- a/php-pecl-datadog-trace.spec +++ b/php-pecl-datadog-trace.spec @@ -35,20 +35,19 @@ Summary: APM and distributed tracing for PHP Name: %{?sub_prefix}php-pecl-datadog-trace Version: 0.18.0 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?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 +Patch0: https://patch-diff.githubusercontent.com/raw/DataDog/dd-trace-php/pull/396.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear # For tests BuildRequires: %{?scl_prefix}php-json +BuildRequires: %{?scl_prefix}php-posix Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} @@ -98,14 +97,12 @@ mv %{proj_name}-%{version} NTS # Don't install tests sed -e 's/role="test"/role="src"/' \ - %{?_licensedir:-e '/LICENSe/s/role="doc"/role="src"/' } \ + %{?_licensedir:-e '/LICENSE/s/role="doc"/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 +cp src/ext/mpack/LICENSE LICENSE.mpack +%patch0 -p1 -b .pr396 : Sanity check, really often broken extver=$(sed -n '/#define PHP_DDTRACE_VERSION /{s/.* "//;s/".*$//;p}' src/ext/version.h) @@ -136,7 +133,6 @@ EOF %build %{?dtsenable} -export CFLAGS="%{optflags} -std=c99" cd NTS %{_bindir}/phpize @@ -181,10 +177,15 @@ done %check %if %{__isa_bits} < 64 rm ?TS/tests/ext/dd_trace_serialize_msgpack.phpt +rm ?TS/tests/ext/dd_trace_serialize_msgpack_error.phpt +rm ?TS/tests/ext/dd_trace_serialize_msgpack_error_strict.phpt +rm ?TS/tests/ext/segfault_backtrace_disabled.phpt +rm ?TS/tests/ext/segfault_backtrace_disabled_via_env_enabled_in_ini.phpt %endif MOD="-n" -[ -f %{php_extdir}/json.so ] && MOD="$MOD -d extension=json.so" +[ -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 @@ -248,6 +249,9 @@ fi %changelog +* Tue Apr 9 2019 Remi Collet <remi@remirepo.net> - 0.18.0-2 +- test build + * 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 |