update to 1.0.0beta7

3 files changed, 28 insertions, 9 deletions

diff --git a/PHPINFO b/PHPINFO
index 91614bf..b138597 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -1,5 +1,9 @@
 
 opentelemetry
 
-opentelemetry support => enabled
-extension version => 1.0.0beta6
+opentelemetry hooks => enabled
+extension version => 1.0.0beta7
+
+Directive => Local Value => Master Value
+opentelemetry.conflicts => blackfire => blackfire
+opentelemetry.validate_hook_functions => On => On
diff --git a/REFLECTION b/REFLECTION
index acf3e7d..523047c 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,13 @@
-Extension [ <persistent> extension #87 opentelemetry version 1.0.0beta6 ] {
+Extension [ <persistent> extension #88 opentelemetry version 1.0.0beta7 ] {
+
+  - INI {
+    Entry [ opentelemetry.conflicts <ALL> ]
+      Current = 'blackfire'
+    }
+    Entry [ opentelemetry.validate_hook_functions <ALL> ]
+      Current = 'On'
+    }
+  }
 
   - Functions {
     Function [ <internal:opentelemetry> function OpenTelemetry\Instrumentation\hook ] {
diff --git a/php-pecl-opentelemetry.spec b/php-pecl-opentelemetry.spec
index 46bda68..73eaa42 100644
--- a/php-pecl-opentelemetry.spec
+++ b/php-pecl-opentelemetry.spec
@@ -15,7 +15,7 @@
 %global ini_name   40-%{pecl_name}.ini
 
 %global upstream_version 1.0.0
-%global upstream_prever  beta6
+%global upstream_prever  beta7
 %global sources          %{pecl_name}-%{upstream_version}%{?upstream_prever}
 %global _configure       ../%{sources}/configure
 
@@ -35,7 +35,6 @@ BuildRequires:  %{?scl_prefix}php-pear
 
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
-%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
 
 Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
@@ -81,8 +80,12 @@ mkdir ZTS
 
 # Create configuration file
 cat << 'EOF' | tee %{ini_name}
-; Enable %{pecl_name} extension module
+; Enable %{summary}
 extension=%{pecl_name}.so
+
+; Configuration
+;opentelemetry.conflicts = 'blackfire'
+;opentelemetry.validate_hook_functions = On
 EOF
 
 
@@ -132,14 +135,14 @@ done
 
 
 %check
+cd %{sources}
+
 : Minimal load test for NTS extension
 %{__php} --no-php-ini \
     --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
     --modules | grep -i '^%{pecl_name}$'
 
 %if %{with tests}
-cd %{sources}
-
 : Upstream test suite for NTS extension
 TEST_PHP_EXECUTABLE=%{__php} \
 TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
@@ -178,7 +181,7 @@ fi
 
 
 %files
-%doc %{pecl_docdir}/%{pecl_name}
+#%%doc %%{pecl_docdir}/%%{pecl_name}
 %{?_licensedir:%license %{sources}/LICENSE*}
 
 %{pecl_xmldir}/%{name}.xml
@@ -192,6 +195,9 @@ fi
 
 
 %changelog
+* Tue Sep  5 2023 Remi Collet <remi@remirepo.net> - 1.0.0~beta7-1
+- update to 1.0.0beta7
+
 * Wed Jun 14 2023 Remi Collet <remi@remirepo.net> - 1.0.0~beta6-1
 - update to 1.0.0beta6