update to 2.9.1

use range dependencies on F27+

2 files changed, 44 insertions, 19 deletions

diff --git a/composer.json b/composer.json
index b06ad84..73d7d84 100644
--- a/composer.json
+++ b/composer.json
@@ -65,7 +65,6 @@
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
-        "upload-coverage": "coveralls -v"
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     }
 }
diff --git a/php-zendframework-zend-feed.spec b/php-zendframework-zend-feed.spec
index 9ccec64..12eb745 100644
--- a/php-zendframework-zend-feed.spec
+++ b/php-zendframework-zend-feed.spec
@@ -1,13 +1,13 @@
 # remirepo/Fedora spec file for php-zendframework-zend-feed
 #
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    abe88686124d492e0a2a84656f15e5482bfbe030
+%global gh_commit    15a6ca78dd8f67b687e4f902657b4e420a8fd1e0
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-feed
@@ -20,7 +20,7 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.9.0
+Version:        2.9.1
 Release:        2%{?dist}
 Summary:        Zend Framework %{library} component
 
@@ -42,8 +42,6 @@ BuildRequires:  php-libxml
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 BuildRequires:  php-tidy
-BuildRequires:  php-autoloader(%{gh_owner}/zend-escaper)        >= 2.5.2
-BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7.7
 # From composer, "require-dev": {
 #        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
 #        "psr/http-message": "^1.0.1",
@@ -53,19 +51,37 @@ BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7.7
 #        "zendframework/zend-http": "^2.7",
 #        "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
 #        "zendframework/zend-validator": "^2.10.1"
+%global phpunit %{_bindir}/phpunit6
+BuildRequires:  phpunit6 >= 6.4.3
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-autoloader(%{gh_owner}/zend-escaper)        >= 2.5.2  with php-autoloader(%{gh_owner}/zend-escaper)        < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7.7  with php-autoloader(%{gh_owner}/zend-stdlib)         < 4)
+BuildRequires: (php-composer(psr/http-message)                  >= 1.0.1  with php-composer(psr/http-message)                  < 2)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-cache)          >= 2.7.2  with php-autoloader(%{gh_owner}/zend-cache)          < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-db)             >= 2.8.2  with php-autoloader(%{gh_owner}/zend-db)             < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-http)           >= 2.7    with php-autoloader(%{gh_owner}/zend-http)           < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.8  with php-autoloader(%{gh_owner}/zend-servicemanager) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-validator)      >= 2.10.1 with php-autoloader(%{gh_owner}/zend-validator)      < 3)
+# remirepo:18
+%else
+BuildRequires:  php-autoloader(%{gh_owner}/zend-escaper)        <  3
+BuildRequires:  php-autoloader(%{gh_owner}/zend-escaper)        >= 2.5.2
+BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         <  4
+BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7.7
 BuildRequires:  php-composer(psr/http-message)                  <  2
 BuildRequires:  php-composer(psr/http-message)                  >= 1.0.1
+BuildRequires:  php-autoloader(%{gh_owner}/zend-cache)          <  3
 BuildRequires:  php-autoloader(%{gh_owner}/zend-cache)          >= 2.7.2
+BuildRequires:  php-autoloader(%{gh_owner}/zend-db)             <  3
 BuildRequires:  php-autoloader(%{gh_owner}/zend-db)             >= 2.8.2
+BuildRequires:  php-autoloader(%{gh_owner}/zend-http)           <  3
 BuildRequires:  php-autoloader(%{gh_owner}/zend-http)           >= 2.7
+BuildRequires:  php-autoloader(%{gh_owner}/zend-servicemanager) <  4
 BuildRequires:  php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.8
+BuildRequires:  php-autoloader(%{gh_owner}/zend-validator)      <  3
 BuildRequires:  php-autoloader(%{gh_owner}/zend-validator)      >= 2.10.1
-%if 0%{?fedora} >= 26
-%global phpunit %{_bindir}/phpunit6
-%else
-%global phpunit %{_bindir}/phpunit
 %endif
-BuildRequires:  %{phpunit}
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
@@ -76,10 +92,20 @@ BuildRequires:  php-fedora-autoloader-devel
 #        "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
 Requires:       php(language) >= 5.6
 %if ! %{bootstrap}
-Requires:       php-autoloader(%{gh_owner}/zend-escaper)        >= 2.5.2
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:      (php-autoloader(%{gh_owner}/zend-escaper)        >= 2.5.2  with php-autoloader(%{gh_owner}/zend-escaper)        < 3)
+Requires:      (php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7.7  with php-autoloader(%{gh_owner}/zend-stdlib)         < 4)
+Requires:      (php-composer(psr/http-message)                  >= 1.0.1  with php-composer(psr/http-message)                  < 2)
+# remirepo:6
+%else
 Requires:       php-autoloader(%{gh_owner}/zend-escaper)        <  3
-Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7.7
+Requires:       php-autoloader(%{gh_owner}/zend-escaper)        >= 2.5.2
 Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         <  4
+Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7.7
+Requires:       php-composer(psr/http-message)                  <  2
+Requires:       php-composer(psr/http-message)                  >= 1.0.1
+%endif
 # From composer, "suggest": {
 #        "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
 #        "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests",
@@ -87,16 +113,12 @@ Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         <  4
 #        "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
 #        "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations",
 #        "zendframework/zend-validator": "Zend\\Validator component, for validating feeds and Atom entries in the Writer subcomponent"
-Requires:       php-composer(psr/http-message)                  <  2
-Requires:       php-composer(psr/http-message)                  >= 1.0.1
-%if 0%{?fedora} >= 21
 Suggests:       php-autoloader(%{gh_owner}/zend-cache)
 Suggests:       php-autoloader(%{gh_owner}/zend-db)
 Suggests:       php-autoloader(%{gh_owner}/zend-http)
 Suggests:       php-autoloader(%{gh_owner}/zend-servicemanager)
 Suggests:       php-autoloader(%{gh_owner}/zend-validator)
 %endif
-%endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
 # From phpcompatinfo report for version 2.6.0
@@ -173,7 +195,7 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
 EOF
 
 ret=0
-for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do
+for cmdarg in "php %{phpunit}" php70 php71 php72; do
   if which $cmdarg; then
     set $cmdarg
     $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit6} --verbose || ret=1
@@ -195,6 +217,10 @@ exit $ret
 
 
 %changelog
+* Tue May 15 2018 Remi Collet <remi@remirepo.net> - 2.9.1-2
+- update to 2.9.1
+- use range dependencies on F27+
+
 * Mon Dec 11 2017 Remi Collet <remi@remirepo.net> - 2.9.0-2
 - switch from zend-loader to fedora/autoloader