diff options
Diffstat (limited to 'php-pecl-datadog-trace.spec')
| -rw-r--r-- | php-pecl-datadog-trace.spec | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec index 8c81ce1..6b1ed39 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.49.0 +Version: 0.51.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 @@ -37,11 +37,20 @@ Source0: https://pecl.php.net/get/%{proj_name}-%{version}.tgz # ddtrace only supports 64-bit platforms ExcludeArch: %{ix86} %{arm} -%if 0%{?rhel} == 6 +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 +%if 0%{?dtsversion} == 0 BuildRequires: devtoolset-6-toolchain +%global dtsversion 6 +%if 0%{?rhel} == 6 +BuildRequires: autoconf268 +%global dtsenable export PHP_AUTOCONF=autoconf268; export PHP_AUTOHEADER=autoheader268; source /opt/rh/devtoolset-6/enable %else -BuildRequires: %{?dtsprefix}gcc +%global dtsenable source /opt/rh/devtoolset-6/enable +%endif +%global dtsprefix devtoolset-6- %endif +%endif +BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 5.4 BuildRequires: %{?scl_prefix}php-pear BuildRequires: curl-devel @@ -68,9 +77,6 @@ Provides: %{?scl_prefix}php-pecl-%{safe_name}%{?_isa} = %{version}-%{rele %if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -%if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-%{safe_name} <= %{version} -%endif %if "%{php_version}" > "7.3" Obsoletes: php73-pecl-%{safe_name} <= %{version} %endif @@ -108,11 +114,11 @@ cd NTS : PEAR installer stuff sed -e 's:@php_dir@:%{pear_phpdir}:' \ -e 's:_BUILD_FROM_PECL_:1:' \ - -i src/ext/ddtrace.c + -i ext/php?/ddtrace.c -cp src/ext/mpack/LICENSE LICENSE.mpack +cp ext/vendor/mpack/LICENSE LICENSE.mpack : Sanity check, really often broken -extver=$(sed -n '/#define PHP_DDTRACE_VERSION /{s/.* "//;s/".*$//;p}' src/ext/version.h) +extver=$(sed -n '/#define PHP_DDTRACE_VERSION /{s/.* "//;s/".*$//;p}' ext/version.h) if test "x${extver}" != "x%{version}"; then : Error: Upstream extension version is ${extver}, expecting %{version}. exit 1 @@ -136,9 +142,6 @@ EOF %build -%if 0%{?rhel} == 6 -source /opt/rh/devtoolset-6/enable -%endif %{?dtsenable} cd NTS @@ -159,9 +162,6 @@ make %{?_smp_mflags} %install -%if 0%{?rhel} == 6 -source /opt/rh/devtoolset-6/enable -%endif %{?dtsenable} make -C NTS install INSTALL_ROOT=%{buildroot} @@ -265,6 +265,12 @@ fi %changelog +* Wed Nov 18 2020 Remi Collet <remi@remirepo.net> - 0.51.0-1 +- update to 0.51.0 + +* Fri Nov 6 2020 Remi Collet <remi@remirepo.net> - 0.50.0-1 +- update to 0.50.0 + * Thu Oct 15 2020 Remi Collet <remi@remirepo.net> - 0.49.0-1 - update to 0.49.0 - allow PHP 5.4 and 5.5 |