diff options
| author | Remi Collet <remi@remirepo.net> | 2025-10-02 09:19:54 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-10-02 09:19:54 +0200 |
| commit | 351c5556c41b3d11e4a05960f0771d5f354ac90b (patch) | |
| tree | ed9f32cd228d99e51f42dfa4c750744d65bd2060 | |
| parent | 31bd6a12d71424e5a2f15e7f002c72beedc414c1 (diff) | |
| -rw-r--r-- | 0001-fix-test-for-php-8.5-194.patch | 27 | ||||
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-opentelemetry.spec | 14 |
4 files changed, 10 insertions, 35 deletions
diff --git a/0001-fix-test-for-php-8.5-194.patch b/0001-fix-test-for-php-8.5-194.patch deleted file mode 100644 index e5bd230..0000000 --- a/0001-fix-test-for-php-8.5-194.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3953640bf49ac099f383d2aa26da5bf1910561c8 Mon Sep 17 00:00:00 2001 -From: Brett McBride <brett.a.mcbride@gmail.com> -Date: Mon, 25 Aug 2025 22:49:36 +1000 -Subject: [PATCH] fix test for php 8.5 (#194) - -Deprecated: Increment on non-numeric string is deprecated, use str_increment() instead in /home/runner/work/opentelemetry-php-instrumentation/opentelemetry-php-instrumentation/ext/tests/multiple_hooks_modify_params.php ---- - ext/tests/multiple_hooks_modify_params.phpt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ext/tests/multiple_hooks_modify_params.phpt b/ext/tests/multiple_hooks_modify_params.phpt -index 136ebe5..90e92f9 100644 ---- a/ext/tests/multiple_hooks_modify_params.phpt -+++ b/ext/tests/multiple_hooks_modify_params.phpt -@@ -11,7 +11,7 @@ function helloWorld($a) { - var_dump($a); - } - --helloWorld('a'); -+helloWorld(1); - ?> - --EXPECT-- --string(1) "c" -+int(3) --- -2.51.0 - @@ -2,7 +2,7 @@ opentelemetry opentelemetry hooks => enabled -extension version => 1.2.0 +extension version => 1.2.1 Directive => Local Value => Master Value opentelemetry.conflicts => no value => no value @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #100 opentelemetry version 1.2.0 ] { +Extension [ <persistent> extension #104 opentelemetry version 1.2.1 ] { - INI { Entry [ opentelemetry.conflicts <ALL> ] diff --git a/php-pecl-opentelemetry.spec b/php-pecl-opentelemetry.spec index 55fef09..cb8fcee 100644 --- a/php-pecl-opentelemetry.spec +++ b/php-pecl-opentelemetry.spec @@ -16,7 +16,7 @@ %global pecl_name opentelemetry %global ini_name 40-%{pecl_name}.ini -%global upstream_version 1.2.0 +%global upstream_version 1.2.1 #global upstream_prever beta3 %global upstream_lower %(echo %{upstream_prever} | tr '[:upper:]' '[:lower:]') %global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} @@ -25,13 +25,11 @@ Summary: OpenTelemetry auto-instrumentation support extension Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: Apache-2.0 URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{sources}.tgz -Patch0: 0001-fix-test-for-php-8.5-194.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ @@ -41,10 +39,13 @@ BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} +# Extension Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} +# PECL Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +# PIE Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version} Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version} @@ -71,8 +72,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd %{sources} -%patch -P0 -p2 - : Sanity check, really often broken extver=$(sed -n '/#define PHP_OPENTELEMETRY_VERSION /{s/.* "//;s/".*$//;p}' php_%{pecl_name}.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then @@ -187,6 +186,9 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ %changelog +* Thu Oct 2 2025 Remi Collet <remi@remirepo.net> - 1.2.1-1 +- update to 1.2.1 + * Thu Sep 4 2025 Remi Collet <remi@remirepo.net> - 1.2.0-2 - add upstream patch for PHP 8.5.0beta2 |