From 1dfb7ae254a01baeaacab9a9f3e9615fd305f466 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Wed, 17 Jun 2015 18:37:45 +0200
Subject: php-pecl-apm: 2.0.5

---
 APM-config.patch  | 12 ++++++------
 REFLECTION        |  8 +++++++-
 php-pecl-apm.spec | 11 ++++-------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/APM-config.patch b/APM-config.patch
index 7332b68..22ee9e6 100644
--- a/APM-config.patch
+++ b/APM-config.patch
@@ -1,5 +1,5 @@
---- apm.ini.rpm	2015-03-16 09:05:02.000000000 +0100
-+++ apm.ini	2015-03-16 09:07:05.000000000 +0100
+--- apm.ini.rpm	2015-06-17 18:05:59.000000000 +0200
++++ apm.ini	2015-06-17 18:19:02.707376619 +0200
 @@ -2,7 +2,7 @@
  
  extension=apm.so
@@ -33,10 +33,10 @@
  ; Whether to enable the statsd driver
 -; apm.statsd_enabled=On
 +apm.statsd_enabled=Off
- ; Whether to collect stats for the StatsD driver
- ; apm.statsd_stats_enabled=On
- ; Host of the statsd server
-@@ -81,7 +81,7 @@
+ ; Error reporting level specific to the statsd driver
+ ; apm.statsd_error_reporting=E_ALL|E_STRICT
+ ; Control which exceptions to collect (0: none exceptions collected, 1: collect uncaught exceptions (default), 2: collect ALL exceptions)
+@@ -85,7 +85,7 @@
  
  ; Socket configuration
  ; Whether to enable the socket driver
diff --git a/REFLECTION b/REFLECTION
index a0f6cd0..f6d0966 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #181 apm version 2.0.4 ] {
+Extension [ <persistent> extension #181 apm version 2.0.5 ] {
 
   - INI {
     Entry [ apm.enabled <SYSTEM> ]
@@ -91,6 +91,9 @@ Extension [ <persistent> extension #181 apm version 2.0.4 ] {
     Entry [ apm.statsd_stats_enabled <ALL> ]
       Current = '1'
     }
+    Entry [ apm.statsd_exception_mode <PERDIR> ]
+      Current = '1'
+    }
     Entry [ apm.statsd_error_reporting <ALL> ]
       Current = ''
     }
@@ -109,6 +112,9 @@ Extension [ <persistent> extension #181 apm version 2.0.4 ] {
     Entry [ apm.socket_stats_enabled <ALL> ]
       Current = '1'
     }
+    Entry [ apm.socket_exception_mode <PERDIR> ]
+      Current = '1'
+    }
     Entry [ apm.socket_error_reporting <ALL> ]
       Current = ''
     }
diff --git a/php-pecl-apm.spec b/php-pecl-apm.spec
index a3e18c0..db29e9b 100644
--- a/php-pecl-apm.spec
+++ b/php-pecl-apm.spec
@@ -23,12 +23,6 @@
 # after 40-json.ini
 %global ini_name  50-%{pecl_name}.ini
 %endif
-%if 0%{?fedora} >= 21
-# support for apache / nginx / php-fpm
-%global with_phpfpm 1
-%else
-%global with_phpfpm 0
-%endif
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 %global with_sqlite 1
 %else
@@ -38,7 +32,7 @@
 
 Name:           %{?scl_prefix}php-pecl-apm
 Summary:        Alternative PHP Monitor
-Version:        2.0.4
+Version:        2.0.5
 Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 Source0:        http://pecl.php.net/get/%{proj_name}-%{version}.tgz
 
@@ -249,6 +243,9 @@ fi
 
 
 %changelog
+* Wed Jun 17 2015 Remi Collet <remi@fedoraproject.org> - 2.0.5-1
+- Update to 2.0.5 (stable)
+
 * Tue Jun 02 2015 Remi Collet <remi@fedoraproject.org> - 2.0.4-1
 - Update to 2.0.4 (stable)
 
-- 
cgit