summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-zendframework-zend-mail.spec16
1 files changed, 10 insertions, 6 deletions
diff --git a/php-zendframework-zend-mail.spec b/php-zendframework-zend-mail.spec
index 045bc9c..8b57e7f 100644
--- a/php-zendframework-zend-mail.spec
+++ b/php-zendframework-zend-mail.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 3311e163de28dc3b41dfba642939132a16336143
+%global gh_commit fcec5a6f32a5646ce81783f319836996bdd03110
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner zendframework
%global gh_project zend-mail
@@ -20,7 +20,7 @@
%endif
Name: php-%{gh_owner}-%{gh_project}
-Version: 2.6.1
+Version: 2.7.0
Release: 1%{?dist}
Summary: Zend Framework %{library} component
@@ -40,7 +40,6 @@ BuildRequires: php-date
BuildRequires: php-iconv
BuildRequires: php-pcre
BuildRequires: php-spl
-BuildRequires: php-composer(%{gh_owner}/zend-crypt) >= 2.6
BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5
BuildRequires: php-composer(%{gh_owner}/zend-mime) >= 2.5
BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 2.7
@@ -48,10 +47,12 @@ BuildRequires: php-composer(%{gh_owner}/zend-validator) >= 2.6
# From composer, "require-dev": {
# "zendframework/zend-config": "^2.6",
# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+# "zendframework/zend-crypt": "^2.6",
# "fabpot/php-cs-fixer": "1.7.*",
# "phpunit/PHPUnit": "~4.0"
BuildRequires: php-composer(%{gh_owner}/zend-config) >= 2.6
BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 2.7.5
+BuildRequires: php-composer(%{gh_owner}/zend-crypt) >= 2.6
BuildRequires: php-composer(phpunit/phpunit) >= 4.0
# Autoloader
BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5
@@ -59,15 +60,12 @@ BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5
# From composer, "require": {
# "php": "^5.5 || ^7.0",
-# "zendframework/zend-crypt": "^2.6",
# "zendframework/zend-loader": "^2.5",
# "zendframework/zend-mime": "^2.5",
# "zendframework/zend-stdlib": "^2.7 || ^3.0",
# "zendframework/zend-validator": "^2.6"
Requires: php(language) >= 5.5
%if ! %{bootstrap}
-Requires: php-composer(%{gh_owner}/zend-crypt) >= 2.6
-Requires: php-composer(%{gh_owner}/zend-crypt) < 3
Requires: php-composer(%{gh_owner}/zend-loader) >= 2.5
Requires: php-composer(%{gh_owner}/zend-loader) < 3
Requires: php-composer(%{gh_owner}/zend-mime) >= 2.5
@@ -78,8 +76,10 @@ Requires: php-composer(%{gh_owner}/zend-validator) >= 2.6
Requires: php-composer(%{gh_owner}/zend-validator) < 3
# From composer, "suggest": {
# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3 when using SMTP to deliver messages"
+# "zendframework/zend-crypt": "^2.6",
%if 0%{?fedora} >= 21
Suggests: php-composer(%{gh_owner}/zend-servicemanager)
+Suggests: php-composer(%{gh_owner}/zend-crypt)
%endif
%endif
# From phpcompatinfo report for version 2.6.1
@@ -156,6 +156,10 @@ rm -rf %{buildroot}
%changelog
+* Tue Apr 12 2016 Remi Collet <remi@fedoraproject.org> - 2.7.0-1
+- update to 2.7.0
+- zend-crypt is now optional
+
* Thu Feb 25 2016 Remi Collet <remi@fedoraproject.org> - 2.6.1-1
- update to 2.6.1