From 54b96ed1273297781b98a1f6d43fd0e21491f4a7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 28 Sep 2023 07:40:42 +0200
Subject: update to 0.7.0

---
 PHPINFO                        |  2 +-
 REFLECTION                     |  2 +-
 php-pecl-skywalking-agent.spec | 14 ++++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index ac889a7..911af7a 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -1,7 +1,7 @@
 
 skywalking_agent
 
-version => 0.6.0
+version => 0.7.0
 authors => Apache Software Foundation:jmjoy <jmjoy@apache.org>:Yanlong He <heyanlong@apache.org>
 
 Directive => Local Value => Master Value
diff --git a/REFLECTION b/REFLECTION
index 2c64b13..ed975f7 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #100 skywalking_agent version 0.6.0 ] {
+Extension [ <persistent> extension #100 skywalking_agent version 0.7.0 ] {
 
   - INI {
     Entry [ skywalking_agent.enable <SYSTEM> ]
diff --git a/php-pecl-skywalking-agent.spec b/php-pecl-skywalking-agent.spec
index 21e248f..7baf023 100644
--- a/php-pecl-skywalking-agent.spec
+++ b/php-pecl-skywalking-agent.spec
@@ -20,7 +20,8 @@
 %global sources    %{pecl_name}-%{version}
 %global _configure ../%{sources}/configure
 
-## BUILD: Fedora / EL-8 and EL-9 using --enablerepo=stream
+## BUILD: Fedora / EL-8 and EL-9 using --enablerepo=stream if needed
+## EL-7 not supported (This crate only supports `libclang` 3.5 and later)
 
 ## TODO: issues
 # no support for offline build
@@ -29,7 +30,7 @@
 
 Summary:        Apache SkyWalking PHP Agent
 Name:           %{?scl_prefix}php-pecl-skywalking-agent
-Version:        0.6.0
+Version:        0.7.0
 Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        Apache-2.0
 URL:            https://pecl.php.net/package/%{pecl_name}
@@ -84,7 +85,6 @@ sed -e 's/role="test"/role="src"/' \
     %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
     -i package.xml
 
-pushd %{sources}
 # Create cargo configuration to use vendor directory
 mkdir .cargo
 cat << EOF | tee .cargo/config.toml
@@ -104,9 +104,10 @@ verbose = true
 replace-with = "vendored-sources"
 
 [source.vendored-sources]
-directory = "$(dirname $PWD)/mycargo"
+directory = "$PWD/mycargo"
 EOF
 
+pushd %{sources}
 : Check version
 grep '^version' Cargo.toml
 grep '^version = "%{version}"' Cargo.toml
@@ -158,7 +159,6 @@ cd %{sources}
 %{__phpize}
 
 cd ../NTS
-cp -r ../%{sources}/.cargo .cargo
 %configure \
     --enable-skywalking_agent \
     --enable-kafka-reporter \
@@ -167,7 +167,6 @@ make %{?_smp_mflags}
 
 %if %{with_zts}
 cd ../ZTS
-cp -r ../%{sources}/.cargo .cargo
 %configure \
     --enable-skywalking_agent \
     --enable-kafka-reporter \
@@ -252,6 +251,9 @@ OPT="-n -d extension=curl.so -d extension=json.so"
 
 
 %changelog
+* Thu Sep 28 2023 Remi Collet <remi@remirepo.net> - 0.7.0-1
+- update to 0.7.0
+
 * Fri Aug 25 2023 Remi Collet <remi@remirepo.net> - 0.6.0-1
 - update to 0.6.0
 - build out of sources tree
-- 
cgit