summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-03-18 11:05:42 +0100
committerRemi Collet <fedora@famillecollet.com>2013-03-18 11:05:42 +0100
commit768fe4a80ea2f05a7f27e92ff69435a68f8aa45f (patch)
tree7f0d963cf42ee95f0d186fc0ae734643daf4af31
parent750453653775d46ae44d0fc5e11b4f610adef83c (diff)
php 5.5, reenable dtrace, add conflicts for opcache
-rw-r--r--php55.spec6
1 files changed, 5 insertions, 1 deletions
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