diff options
| author | Remi Collet <remi@remirepo.net> | 2020-02-19 16:29:05 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-02-19 16:29:05 +0100 |
| commit | c3beb431faf0d035ab1e20284fbe42fe8c590d20 (patch) | |
| tree | ef0a5a08d4faae4334479af44a320706d3cef2f6 | |
| parent | 1cccfbf241a6136884f16e17f99e5940fed9c898 (diff) | |
update to 1.1.1 (no change)
drop patch merged upstream
| -rw-r--r-- | 62.patch | 25 | ||||
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-scoutapm.spec | 10 |
4 files changed, 7 insertions, 32 deletions
diff --git a/62.patch b/62.patch deleted file mode 100644 index 7c62f6d..0000000 --- a/62.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0de44cc0483e139ff01f9efb8c01160b488c758f Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 19 Feb 2020 13:19:14 +0100 -Subject: [PATCH] fix typo in check - ---- - config.m4 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/config.m4 b/config.m4 -index 5043962..93ddb3d 100644 ---- a/config.m4 -+++ b/config.m4 -@@ -15,9 +15,9 @@ PHP_ARG_ENABLE([scoutapm-dev], - if test "$PHP_SCOUTAPM" != "no"; then - - dnl modern version provides libcurl.pc -- AC_PATH_PROG(PKG_CONFIG, wpkg-config, no) -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - dnl old version only provides curl-config -- AC_PATH_PROG(CURL_CONFIG, wcurl-config, no) -+ AC_PATH_PROG(CURL_CONFIG, curl-config, no) - - AC_MSG_CHECKING(for libcurl headers) - if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libcurl; then @@ -2,7 +2,7 @@ scoutapm scoutapm support => enabled -Version => 1.1.0 +Version => 1.1.1 curl functions => Yes file functions => Yes pdo functions => Yes @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #112 scoutapm version 1.1.0 ] { +Extension [ <persistent> extension #112 scoutapm version 1.1.1 ] { - Functions { Function [ <internal:scoutapm> function scoutapm_get_calls ] { diff --git a/php-pecl-scoutapm.spec b/php-pecl-scoutapm.spec index 397b7ba..f48c8e6 100644 --- a/php-pecl-scoutapm.spec +++ b/php-pecl-scoutapm.spec @@ -17,14 +17,12 @@ Summary: Native Extension Component for ScoutAPM's PHP Agent Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.1.0 +Version: 1.1.1 Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz License: PHP URL: https://pecl.php.net/package/%{pecl_name} -Patch0: https://patch-diff.githubusercontent.com/raw/scoutapp/scout-apm-php-ext/pull/62.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 7.1 BuildRequires: %{?scl_prefix}php-pear @@ -87,8 +85,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml pushd NTS -%patch0 -p1 -b .pr62 - : Check version extver=$(sed -n '/#define PHP_SCOUTAPM_VERSION /{s/.* "//;s/".*$//;p}' zend_scoutapm.h) if test "x${extver}" != "x%{version}%{?prever}"; then @@ -221,6 +217,10 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \ %changelog +* Wed Feb 19 2020 Remi Collet <remi@remirepo.net> - 1.1.1-1 +- update to 1.1.1 (no change) +- drop patch merged upstream + * Wed Feb 19 2020 Remi Collet <remi@remirepo.net> - 1.1.0-1 - update to 1.1.0 - add patch for libcurl detection from |