diff options
Diffstat (limited to 'php-pecl-opentelemetry.spec')
| -rw-r--r-- | php-pecl-opentelemetry.spec | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/php-pecl-opentelemetry.spec b/php-pecl-opentelemetry.spec index 90c7cfc..89dd181 100644 --- a/php-pecl-opentelemetry.spec +++ b/php-pecl-opentelemetry.spec @@ -8,27 +8,23 @@ # %{?scl:%scl_package php-pecl-opentelemetry} -# https://github.com/open-telemetry/opentelemetry-php-instrumentation/issues/46 -%bcond_with tests +%bcond_without tests %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%global proj_name opentelemetry -%global pecl_name otel_instrumentation -%global ini_name 40-%{proj_name}.ini +%global pecl_name opentelemetry +%global ini_name 40-%{pecl_name}.ini %global upstream_version 1.0.0 -%global upstream_prever beta2 -%global sources %{proj_name}-%{upstream_version}%{?upstream_prever} +%global upstream_prever beta3 +%global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} Summary: OpenTelemetry auto-instrumentation support extension -Name: %{?scl_prefix}php-pecl-%{proj_name} +Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: Apache-2.0 -URL: https://pecl.php.net/package/%{proj_name} +URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{sources}.tgz -# https://github.com/open-telemetry/opentelemetry-php-instrumentation/issues/45 -Source1: https://raw.githubusercontent.com/open-telemetry/opentelemetry-php-instrumentation/main/LICENSE BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -42,10 +38,8 @@ Requires: %{?scl_prefix}php(api) = %{php_core_api} Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} -Provides: %{?scl_prefix}php-%{proj_name} = %{version} -Provides: %{?scl_prefix}php-%{proj_name}%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(%{proj_name}) = %{version} -Provides: %{?scl_prefix}php-pecl(%{proj_name})%{?_isa} = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} %description @@ -70,10 +64,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd %{sources} -cp %{SOURCE1} LICENSE - : Sanity check, really often broken -extver=$(sed -n '/# define PHP_OTEL_INSTRUMENTATION_VERSION /{s/.* "//;s/".*$//;p}' php_otel_instrumentation.h) +extver=$(sed -n '/# define PHP_OPENTELEMETRY_VERSION /{s/.* "//;s/".*$//;p}' php_%{pecl_name}.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}. exit 1 @@ -88,7 +80,7 @@ mkdir ZTS # Create configuration file cat << 'EOF' | tee %{ini_name} -; Enable %{proj_name} extension module +; Enable %{pecl_name} extension module extension=%{pecl_name}.so EOF @@ -103,14 +95,14 @@ cd %{sources} cd ../NTS %configure \ - --with-otel_instrumentation \ + --enable-opentelemetry \ --with-php-config=%{_bindir}/php-config make %{?_smp_mflags} %if %{with_zts} cd ../ZTS %configure \ - --with-otel_instrumentation \ + --enable-opentelemetry \ --with-php-config=%{_bindir}/zts-php-config make %{?_smp_mflags} %endif @@ -151,7 +143,7 @@ cd %{sources} : Upstream test suite for NTS extension TEST_PHP_EXECUTABLE=%{__php} \ -TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ +TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ %{__php} -n run-tests.php --show-diff @@ -181,7 +173,7 @@ fi %postun if [ $1 -eq 0 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{proj_name} >/dev/null || : + %{pecl_uninstall} %{pecl_name} >/dev/null || : fi %endif @@ -201,6 +193,10 @@ fi %changelog +* Sat Apr 1 2023 Remi Collet <remi@remirepo.net> - 1.0.0~beta3-1 +- update to 1.0.0beta3 +- extension renamed from otel_instrumentation to opentelemetry + * Thu Mar 30 2023 Remi Collet <remi@remirepo.net> - 1.0.0~beta2-1 - initial package, version 1.0.0beta2 - open https://github.com/open-telemetry/opentelemetry-php-instrumentation/issues/45 |