diff options
| -rw-r--r-- | APM-pr51.patch | 27 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-apm.spec | 10 |
3 files changed, 7 insertions, 32 deletions
diff --git a/APM-pr51.patch b/APM-pr51.patch deleted file mode 100644 index ee9c5c8..0000000 --- a/APM-pr51.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 56d27611af6ee100db07fd07a2fbd76be4341354 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Mon, 13 Feb 2017 16:27:43 +0100 -Subject: [PATCH] Fix #50 build for PHP 5 - ---- - backtrace.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/backtrace.c b/backtrace.c -index 5b0d57c..692a1a5 100644 ---- a/backtrace.c -+++ b/backtrace.c -@@ -378,11 +378,13 @@ static void append_flat_zval_r(zval *expr TSRMLS_DC, smart_str *trace_str, char - } - - switch (Z_TYPE_P(expr)) { -+#if PHP_VERSION_ID >= 70000 - case IS_REFERENCE: - ZVAL_DEREF(expr); - smart_str_appendc(trace_str, '&'); - append_flat_zval_r(expr, trace_str, depth); - break; -+#endif - case IS_ARRAY: - smart_str_appendc(trace_str, '['); - #if PHP_VERSION_ID >= 70000 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #162 apm version 2.1.2 ] { +Extension [ <persistent> extension #162 apm version 2.1.3 ] { - INI { Entry [ apm.enabled <SYSTEM> ] diff --git a/php-pecl-apm.spec b/php-pecl-apm.spec index c70c8fe..ca965b4 100644 --- a/php-pecl-apm.spec +++ b/php-pecl-apm.spec @@ -37,7 +37,7 @@ Name: %{?sub_prefix}php-pecl-apm Summary: Alternative PHP Monitor -Version: 2.1.2 +Version: 2.1.3 %if 0%{?gh_date:1} Release: 7.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz @@ -48,8 +48,6 @@ Source0: http://pecl.php.net/get/%{proj_name}-%{version}.tgz # Disable the extension and drivers by default Patch0: %{proj_name}-config.patch -# See https://github.com/patrickallaert/php-apm/pull/51 -Patch1: %{proj_name}-pr51.patch License: PHP Group: Development/Languages @@ -143,7 +141,6 @@ mv %{proj_name}-%{version} NTS cd NTS %patch0 -p0 -b .rpm -%patch1 -p1 -b .pr51 sed -e 's:/var/php/apm/db:%{_localstatedir}/lib/php/apm/db:' -i apm.ini : Sanity check, really often broken @@ -281,8 +278,13 @@ fi %changelog +* Mon Feb 13 2017 Remi Collet <remi@fedoraproject.org> - 2.1.3-1 +- Update to 2.1.3 (stable) +- drop patch merged upstream + * Mon Feb 13 2017 Remi Collet <remi@fedoraproject.org> - 2.1.2-1 - Update to 2.1.2 (stable) +- drop patch merged upstream - open https://github.com/patrickallaert/php-apm/issues/50 PHP 5 build is broken - add patch from https://github.com/patrickallaert/php-apm/pull/51 |