summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-06-14 18:52:34 +0200
committerRemi Collet <fedora@famillecollet.com>2013-06-14 18:52:34 +0200
commit4a9e7e71e5a176e553fb132efd7e32c15507af73 (patch)
tree4efb7c4add0bd4f89ab5b52ce7b5617d8b3baeb1
parentfdc9f4e6d66c86424817013d02ee8ca89b50ee12 (diff)
php-xcache: missing conflicts...
-rw-r--r--php-xcache-dev.spec1
-rw-r--r--php-xcache.spec1
2 files changed, 2 insertions, 0 deletions
diff --git a/php-xcache-dev.spec b/php-xcache-dev.spec
index 770ed0f..be92346 100644
--- a/php-xcache-dev.spec
+++ b/php-xcache-dev.spec
@@ -41,6 +41,7 @@ Requires: php(api) = %{php_core_api}
# Only one opcode cache can be installed
Conflicts: php-pecl-apc < 3.1.15
Conflicts: php-eaccelerator
+Conflicts: php-opcache
# Other third party repo stuff
Obsoletes: php53-xcache
diff --git a/php-xcache.spec b/php-xcache.spec
index b00ad16..fb0cbff 100644
--- a/php-xcache.spec
+++ b/php-xcache.spec
@@ -31,6 +31,7 @@ Requires: php(api) = %{php_core_api}
# Only one opcode cache can be installed
Conflicts: php-pecl-apc < 3.1.15
Conflicts: php-eaccelerator
+Conflicts: php-pecl-zendopcache
# Other third party repo stuff
Obsoletes: php53-xcache