summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-12-13 10:32:35 +0100
committerRemi Collet <remi@remirepo.net>2019-12-13 10:32:35 +0100
commit872a8973c37702a7576e04bb5183905632c006b5 (patch)
treeab45216a085a1233ecbcec91e3d02f6762f7cc5f
parented5ce7229b77ff9aefe2d21771ca04de503db2e5 (diff)
v2.10.1HEADmaster
-rw-r--r--composer.json3
-rw-r--r--php-zendframework-zend-i18n.spec7
2 files changed, 8 insertions, 2 deletions
diff --git a/composer.json b/composer.json
index f412870..2e63518 100644
--- a/composer.json
+++ b/composer.json
@@ -31,6 +31,9 @@
"zendframework/zend-validator": "^2.6",
"zendframework/zend-view": "^2.6.3"
},
+ "conflict": {
+ "phpspec/prophecy": "<1.9.0"
+ },
"suggest": {
"zendframework/zend-cache": "Zend\\Cache component",
"zendframework/zend-config": "Zend\\Config component",
diff --git a/php-zendframework-zend-i18n.spec b/php-zendframework-zend-i18n.spec
index ed858a6..6ded3c3 100644
--- a/php-zendframework-zend-i18n.spec
+++ b/php-zendframework-zend-i18n.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 561a815ce32c86b0f1de11135477e637926d56b6
+%global gh_commit 84038e6a1838b611dcc491b1c40321fa4c3a123c
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner zendframework
%global gh_project zend-i18n
@@ -20,7 +20,7 @@
%endif
Name: php-%{gh_owner}-%{gh_project}
-Version: 2.10.0
+Version: 2.10.1
Release: 2%{?dist}
Summary: Zend Framework %{library} component
@@ -217,6 +217,9 @@ exit $ret
%changelog
+* Fri Dec 13 2019 Remi Collet <remi@remirepo.net> - 2.10.1-2
+- update to 2.10.1
+
* Tue Nov 19 2019 Remi Collet <remi@remirepo.net> - 2.10.0-2
- update to 2.10.0