From fb3d5bcbcd6442326ecc4d91d34e6e5acafb3eed Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 4 Sep 2024 15:19:43 +0200
Subject: update to 1.1.0beta2

open https://github.com/open-telemetry/opentelemetry-php/issues/1376 PHP 8.4 compatibility
---
 php-pecl-opentelemetry.spec | 40 +++++++++++-----------------------------
 1 file changed, 11 insertions(+), 29 deletions(-)

(limited to 'php-pecl-opentelemetry.spec')

diff --git a/php-pecl-opentelemetry.spec b/php-pecl-opentelemetry.spec
index 32c0bb0..7195a6c 100644
--- a/php-pecl-opentelemetry.spec
+++ b/php-pecl-opentelemetry.spec
@@ -14,8 +14,8 @@
 %global pecl_name  opentelemetry
 %global ini_name   40-%{pecl_name}.ini
 
-%global upstream_version 1.0.3
-#global upstream_prever  beta1
+%global upstream_version 1.1.0
+%global upstream_prever  beta2
 %global upstream_lower   %(echo %{upstream_prever} | tr '[:upper:]' '[:lower:]')
 %global sources          %{pecl_name}-%{upstream_version}%{?upstream_prever}
 %global _configure       ../%{sources}/configure
@@ -61,14 +61,10 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 # Don't install tests
 sed -e 's/role="test"/role="src"/' \
-    %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+    -e '/LICENSE/s/role="doc"/role="src"/' \
     -i package.xml
 
 cd %{sources}
-%if 0%{?rhel} == 7
-sed -e 's/-Werror//' -i config.m4
-%endif
-
 : 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
@@ -92,6 +88,9 @@ extension=%{pecl_name}.so
 ;opentelemetry.conflicts = 'blackfire'
 ;opentelemetry.validate_hook_functions = On
 ;opentelemetry.allow_stack_extension = Off
+;opentelemetry.attr_hooks_enabled = Off
+;opentelemetry.attr_pre_handler_function =OpenTelemetry\API\Instrumentation\WithSpanHandler::pre
+;opentelemetry.attr_post_handler_function = OpenTelemetry\API\Instrumentation\WithSpanHandler::post
 EOF
 
 
@@ -165,30 +164,9 @@ REPORT_EXIT_STATUS=1 \
 %endif
 
 
-
-%if 0%{?fedora} < 24 && 0%{?rhel} < 8
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
-    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
-    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
-    %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
-%endif
-
-
 %files
 #%%doc %%{pecl_docdir}/%%{pecl_name}
-%{?_licensedir:%license %{sources}/LICENSE*}
+%license %{sources}/LICENSE*
 
 %{pecl_xmldir}/%{name}.xml
 %config(noreplace) %{php_inidir}/%{ini_name}
@@ -201,6 +179,10 @@ fi
 
 
 %changelog
+* Wed Sep  4 2024 Remi Collet <remi@remirepo.net> - 1.1.0~beta2-1
+- update to 1.1.0beta2
+- open https://github.com/open-telemetry/opentelemetry-php/issues/1376 PHP 8.4 compatibility
+
 * Sat May  4 2024 Remi Collet <remi@remirepo.net> - 1.0.3-1
 - update to 1.0.3
 
-- 
cgit