update to 2.8.0HEADmaster

raise dependency on zend-stdlib 3.2.1
use range dependencies

2 files changed, 36 insertions, 15 deletions

diff --git a/composer.json b/composer.json
index 2e66ab4..74590cd 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     },
     "require": {
         "php": "^5.6 || ^7.0",
-        "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
+        "zendframework/zend-stdlib": "^3.2.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7.23 || ^6.4.3",
@@ -45,8 +45,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7.x-dev",
-            "dev-develop": "2.8.x-dev"
+            "dev-master": "2.8.x-dev",
+            "dev-develop": "2.9.x-dev"
         }
     },
     "scripts": {
diff --git a/php-zendframework-zend-console.spec b/php-zendframework-zend-console.spec
index 82e14f8..4cba6b2 100644
--- a/php-zendframework-zend-console.spec
+++ b/php-zendframework-zend-console.spec
@@ -1,13 +1,13 @@
 # remirepo/Fedora spec file for php-zendframework-zend-console
 #
-# Copyright (c) 2015-2018 Remi Collet
+# Copyright (c) 2015-2019 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    e8aa08da83de3d265256c40ba45cd649115f0e18
+%global gh_commit    95817ae78f73c48026972e350a2ecc31c6d9f9ae
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-console
@@ -20,11 +20,10 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.7.0
-Release:        2%{?dist}
+Version:        2.8.0
+Release:        1%{?dist}
 Summary:        Zend Framework %{library} component
 
-Group:          Development/Libraries
 License:        BSD
 URL:            https://zendframework.github.io/%{gh_project}/
 Source0:        %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
@@ -40,34 +39,51 @@ BuildRequires:  php-pcre
 BuildRequires:  php-reflection
 BuildRequires:  php-spl
 BuildRequires:  php-xml
-BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7.7
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib)         >= 3.2.1  with php-autoloader(%{gh_owner}/zend-stdlib)         < 4)
 # From composer, "require-dev": {
 #        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
 #        "zendframework/zend-coding-standard": "~1.0.0",
 #        "zendframework/zend-filter": "^2.7.2",
 #        "zendframework/zend-json": "^2.6 || ^3.0",
 #        "zendframework/zend-validator": "^2.10.1"
-BuildRequires:  phpunit6                                        >= 6.4.3
+BuildRequires: (php-autoloader(%{gh_owner}/zend-filter)         >= 2.7.2  with php-autoloader(%{gh_owner}/zend-filter)         < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-json)           >= 2.6    with php-autoloader(%{gh_owner}/zend-json)           < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-validator)      >= 2.10.1 with php-autoloader(%{gh_owner}/zend-validator)      < 3)
+# remirepo:10
+%else
+BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         <  4
+BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 3.2.1
+BuildRequires:  php-autoloader(%{gh_owner}/zend-filter)         <  3
 BuildRequires:  php-autoloader(%{gh_owner}/zend-filter)         >= 2.7.2
+BuildRequires:  php-autoloader(%{gh_owner}/zend-json)           <  4
 BuildRequires:  php-autoloader(%{gh_owner}/zend-json)           >= 2.6
+BuildRequires:  php-autoloader(%{gh_owner}/zend-validator)      <  3
 BuildRequires:  php-autoloader(%{gh_owner}/zend-validator)      >= 2.10.1
 %endif
+BuildRequires:  phpunit6                                        >= 6.4.3
+%endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
 #        "php": "^5.6 || ^7.0",
-#        "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
+#        "zendframework/zend-stdlib": "^3.2.1"
 Requires:       php(language) >= 5.6
 %if ! %{bootstrap}
-Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7.7
-Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         <  4
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:      (php-autoloader(%{gh_owner}/zend-stdlib)         >= 3.2.1  with php-autoloader(%{gh_owner}/zend-stdlib)         < 4)
 # From composer, "suggest": {
 #        "zendframework/zend-validator": "To support DefaultRouteMatcher usage",
 #        "zendframework/zend-filter": "To support DefaultRouteMatcher usage"
-%if 0%{?fedora} >= 21
 Suggests:       php-autoloader(%{gh_owner}/zend-validator)
 Suggests:       php-autoloader(%{gh_owner}/zend-filter)
+# remirepo:4
+%else
+Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         <  4
+Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         >= 3.2.1
 %endif
 %endif
 # Autoloader
@@ -129,7 +145,7 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
 EOF
 
 ret=0
-for cmd in php php70 php71 php72; do
+for cmd in php php70 php71 php72 php73; do
   if which $cmd; then
     $cmd %{_bindir}/phpunit6 || ret=1
   fi
@@ -149,6 +165,11 @@ exit $ret
 
 
 %changelog
+* Tue Feb  5 2019 Remi Collet <remi@remirepo.net> - 2.8.0-1
+- update to 2.8.0
+- raise dependency on zend-stdlib 3.2.1
+- use range dependencies
+
 * Fri Jan 26 2018 Remi Collet <remi@remirepo.net> - 2.7.0-1
 - Update to 2.7.0
 - raise dependency on PHP 5.6