From 768fe4a80ea2f05a7f27e92ff69435a68f8aa45f Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Mon, 18 Mar 2013 11:05:42 +0100
Subject: php 5.5, reenable dtrace, add conflicts for opcache

---
 php55.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/php55.spec b/php55.spec
index dc637d5..326d181 100644
--- a/php55.spec
+++ b/php55.spec
@@ -54,7 +54,7 @@
 %{!?_httpd_contentdir: %{expand: %%global _httpd_contentdir /var/www}}
 
 %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
-%global with_dtrace 0
+%global with_dtrace 1
 %else
 %global with_dtrace 0
 %endif
@@ -330,6 +330,10 @@ Provides:  php-pecl-zendoptimizerplus = %{opcachever}
 Provides:  php-pecl-zendoptimizerplus%{?_isa} = %{opcachever}
 Provides:  php-pecl(opcache) = %{opcachever}
 Provides:  php-pecl(opcache)%{?_isa} = %{opcachever}
+# Only one opcode cache could be enabled
+Conflicts: php-xcache
+# APC 3.1.15 offer an option to disable opcache
+Conflicts: php-pecl-apc < 3.1.15
 
 %description opcache
 The Zend Optimizer+ provides faster PHP execution through opcode caching and
-- 
cgit