summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-07-30 10:33:16 +0200
committerRemi Collet <fedora@famillecollet.com>2016-07-30 10:33:16 +0200
commit321c49f1677fa552114fb9a48c585796dc2d00e7 (patch)
tree199c8b4b44e73aa1391316ba936b47a572f9cfa3
parenta6914ca2eba7886b194d477ef96c83c932520955 (diff)
php-phalcon3: tweaks
-rw-r--r--php-phalcon3.spec7
1 files changed, 6 insertions, 1 deletions
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 <remi@fedoraproject.org> - 3.0.0-1
- update to 3.0.0
+- rename to php-phalcon2
* Fri May 20 2016 Remi Collet <remi@fedoraproject.org> - 2.0.13-1
- update to 2.0.13