From 321c49f1677fa552114fb9a48c585796dc2d00e7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 30 Jul 2016 10:33:16 +0200 Subject: php-phalcon3: tweaks --- php-phalcon3.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/php-phalcon3.spec b/php-phalcon3.spec index 71edaa3..1067103 100644 --- a/php-phalcon3.spec +++ b/php-phalcon3.spec @@ -66,13 +66,17 @@ Provides: %{?scl_prefix}php-phalcon%{?_isa} = %{version}-%{release} Provides: %{?scl_prefix}php-phalcon3 = %{version}-%{release} Provides: %{?scl_prefix}php-phalcon3%{?_isa} = %{version}-%{release} %endif +%if "%{php_version}" > "7" +Obsoletes: %{?scl_prefix}php-phalcon < 3 +Obsoletes: %{?scl_prefix}php-phalcon2 < 3 +%else # Only one version can be installed Conflicts: %{?scl_prefix}php-phalcon < 3 Conflicts: %{?scl_prefix}php-phalcon2 < 3 +%endif # Don't provides php-composer(phalcon/cphalcon), not registered on packagist - %if 0%{?fedora} < 20 && 0%{?rhel} < 7 # Filter shared private %{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} @@ -238,6 +242,7 @@ rm -rf %{buildroot} %changelog * Sat Jul 30 2016 Remi Collet - 3.0.0-1 - update to 3.0.0 +- rename to php-phalcon2 * Fri May 20 2016 Remi Collet - 2.0.13-1 - update to 2.0.13 -- cgit