summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json3
-rw-r--r--php-zendframework-zend-diactoros.spec11
2 files changed, 11 insertions, 3 deletions
diff --git a/composer.json b/composer.json
index cc6d19d..f427809 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,8 @@
"extra": {
"branch-alias": {
"dev-master": "1.7.x-dev",
- "dev-develop": "1.8.x-dev"
+ "dev-develop": "1.8.x-dev",
+ "dev-release-2.0": "2.0.x-dev"
}
},
"require": {
diff --git a/php-zendframework-zend-diactoros.spec b/php-zendframework-zend-diactoros.spec
index efe91d2..5ddfef3 100644
--- a/php-zendframework-zend-diactoros.spec
+++ b/php-zendframework-zend-diactoros.spec
@@ -12,8 +12,8 @@
%global github_owner zendframework
%global github_name zend-diactoros
-%global github_version 1.7.1
-%global github_commit bf26aff803a11c5cc8eb7c4878a702c403ec67f1
+%global github_version 1.7.2
+%global github_commit 741e7a571836f038de731105f4742ca8a164e43a
%global composer_vendor zendframework
%global composer_project zend-diactoros
@@ -48,9 +48,11 @@ BuildArch: noarch
%if %{with_tests}
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
+# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
%global phpunit %{_bindir}/phpunit6
BuildRequires: (php-composer(psr/http-message) >= %{psr_http_message_min_ver} with php-composer(psr/http-message) < %{psr_http_message_max_ver})
+# remirepo:5
%else
%global phpunit %{_bindir}/phpunit
BuildRequires: php-composer(psr/http-message) < %{psr_http_message_max_ver}
@@ -75,8 +77,10 @@ BuildRequires: php-fedora-autoloader-devel
# composer.json
Requires: php(language) >= %{php_min_ver}
+# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Requires: (php-composer(psr/http-message) >= %{psr_http_message_min_ver} with php-composer(psr/http-message) < %{psr_http_message_max_ver})
+# remirepo:4
%else
Requires: php-composer(psr/http-message) < %{psr_http_message_max_ver}
Requires: php-composer(psr/http-message) >= %{psr_http_message_min_ver}
@@ -171,6 +175,9 @@ exit $RETURN_CODE
%changelog
+* Wed May 30 2018 Remi Collet <remi@remirepo.net> - 1.7.2-1
+- update to 1.7.2
+
* Fri Mar 30 2018 Remi Collet <remi@remirepo.net> - 1.7.1-1
- update to 1.7.1
- use range dependencies on F27+