From be10996be782d22ed7c8e62c4ac93946654851e9 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 30 Mar 2018 09:53:26 +0200
Subject: update to 1.7.1 use range dependencies on F27+

---
 composer.json                         |  3 +--
 php-zendframework-zend-diactoros.spec | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 9899a71..cc6d19d 100644
--- a/composer.json
+++ b/composer.json
@@ -57,7 +57,6 @@
     "cs-check": "phpcs",
     "cs-fix": "phpcbf",
     "test": "phpunit --colors=always",
-    "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
-    "upload-coverage": "php-coveralls -v"
+    "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
   }
 }
diff --git a/php-zendframework-zend-diactoros.spec b/php-zendframework-zend-diactoros.spec
index d8461ca..efe91d2 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.0
-%global github_commit    ed6ce7e2105c400ca10277643a8327957c0384b7
+%global github_version   1.7.1
+%global github_commit    bf26aff803a11c5cc8eb7c4878a702c403ec67f1
 
 %global composer_vendor  zendframework
 %global composer_project zend-diactoros
@@ -48,14 +48,15 @@ BuildArch:     noarch
 %if %{with_tests}
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
-%if 0%{?fedora} >= 26
+%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})
 %else
 %global phpunit %{_bindir}/phpunit
-%endif
-BuildRequires: %{phpunit}
 BuildRequires: php-composer(psr/http-message) <  %{psr_http_message_max_ver}
 BuildRequires: php-composer(psr/http-message) >= %{psr_http_message_min_ver}
+%endif
+BuildRequires: %{phpunit}
 BuildRequires: php-dom
 BuildRequires: php-libxml
 ## phpcompatinfo (computed from version 1.6.0)
@@ -74,8 +75,12 @@ BuildRequires: php-fedora-autoloader-devel
 
 # composer.json
 Requires:      php(language) >= %{php_min_ver}
+%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})
+%else
 Requires:      php-composer(psr/http-message) <  %{psr_http_message_max_ver}
 Requires:      php-composer(psr/http-message) >= %{psr_http_message_min_ver}
+%endif
 # phpcompatinfo (computed from version 1.4.1)
 Requires:      php-json
 Requires:      php-pcre
@@ -166,6 +171,10 @@ exit $RETURN_CODE
 
 
 %changelog
+* Fri Mar 30 2018 Remi Collet <remi@remirepo.net> - 1.7.1-1
+- update to 1.7.1
+- use range dependencies on F27+
+
 * Fri Jan  5 2018 Remi Collet <remi@remirepo.net> - 1.7.0-1
 - Update to 1.7.0
 
-- 
cgit