summaryrefslogtreecommitdiffstats
path: root/php-pecl-skywalking.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php-pecl-skywalking.spec')
-rw-r--r--php-pecl-skywalking.spec14
1 files changed, 12 insertions, 2 deletions
diff --git a/php-pecl-skywalking.spec b/php-pecl-skywalking.spec
index adc39f8..7d263da 100644
--- a/php-pecl-skywalking.spec
+++ b/php-pecl-skywalking.spec
@@ -21,12 +21,14 @@
Summary: The PHP instrument agent for Apache SkyWalking
Name: %{?sub_prefix}php-pecl-%{pecl_name}
Version: 4.0.0
-Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
License: ASL 2.0
URL: https://pecl.php.net/package/%{pecl_name}
Patch0: https://patch-diff.githubusercontent.com/raw/SkyAPM/SkyAPM-php-sdk/pull/274.patch
+Patch1: https://patch-diff.githubusercontent.com/raw/SkyAPM/SkyAPM-php-sdk/pull/275.patch
+Patch2: https://patch-diff.githubusercontent.com/raw/SkyAPM/SkyAPM-php-sdk/pull/276.patch
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel > 7.0
@@ -94,7 +96,9 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
pushd NTS
-%patch0 -p1 -b .pr
+%patch0 -p1 -b .pr274
+%patch1 -p1 -b .pr275
+%patch2 -p1 -b .pr276
: Check version
extver=$(sed -n '/#define PHP_SKYWALKING_VERSION /{s/.* "//;s/".*$//;p}' php_skywalking.h)
@@ -243,6 +247,12 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \
%changelog
+* Thu Oct 15 2020 Remi Collet <remi@remirepo.net> - 4.0.0-2
+- add patch to properly check available command from
+ https://github.com/SkyAPM/SkyAPM-php-sdk/pull/275
+- add patch to fix build with PHP 8 from
+ https://github.com/SkyAPM/SkyAPM-php-sdk/pull/276
+
* Thu Oct 15 2020 Remi Collet <remi@remirepo.net> - 4.0.0-1
- update to 4.0.0
- add patch to properly use cxx for link from