From e6ea636ced80b424e0975bb2ed7e57ee58f51d0a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 31 Jan 2018 10:32:39 +0100
Subject: v2.8.1

---
 composer.json                         |  5 ++---
 php-zendframework-zend-paginator.spec | 24 +++++++++++-------------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/composer.json b/composer.json
index a80bb61..f0b6c7a 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
         "zendframework/zend-cache": "^2.6.1",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-config": "^2.6.0",
-        "zendframework/zend-db": "^2.7",
+        "zendframework/zend-db": "^2.9.2",
         "zendframework/zend-filter": "^2.6.1",
         "zendframework/zend-json": "^2.6.1",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
@@ -66,7 +66,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-paginator.spec b/php-zendframework-zend-paginator.spec
index 6a084ba..3054300 100644
--- a/php-zendframework-zend-paginator.spec
+++ b/php-zendframework-zend-paginator.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    655b9ef28092b283e10e6c6a4f42c82db992b2ba
+%global gh_commit    fd58828c8280a90f133b9e0af2fe1a7885d47206
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-paginator
@@ -20,7 +20,7 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.8.0
+Version:        2.8.1
 Release:        2%{?dist}
 Summary:        Zend Framework %{library} component
 
@@ -41,23 +41,19 @@ BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
 #        "zendframework/zend-cache": "^2.6.1",
 #        "zendframework/zend-coding-standard": "~1.0.0",
 #        "zendframework/zend-config": "^2.6.0",
-#        "zendframework/zend-db": "^2.7",
+#        "zendframework/zend-db": "^2.9.2",
 #        "zendframework/zend-filter": "^2.6.1",
 #        "zendframework/zend-json": "^2.6.1",
 #        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
 #        "zendframework/zend-view": "^2.6.3"
 BuildRequires:  php-autoloader(%{gh_owner}/zend-cache)          >= 2.6.1
 BuildRequires:  php-autoloader(%{gh_owner}/zend-config)         >= 2.6.0
-BuildRequires:  php-autoloader(%{gh_owner}/zend-db)             >= 2.7
+BuildRequires:  php-autoloader(%{gh_owner}/zend-db)             >= 2.9.2
 BuildRequires:  php-autoloader(%{gh_owner}/zend-filter)         >= 2.6.1
 BuildRequires:  php-autoloader(%{gh_owner}/zend-json)           >= 2.6.1
 BuildRequires:  php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5
 BuildRequires:  php-autoloader(%{gh_owner}/zend-view)           >= 2.6.3
-%if 0%{?fedora} >= 26
-%global phpunit %{_bindir}/phpunit6
-%else
-%global phpunit %{_bindir}/phpunit
-%endif
+BuildRequires:  phpunit6 >= 6.2.1
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
@@ -145,10 +141,9 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
 EOF
 
 ret=0
-for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do
-  if which $cmdarg; then
-    set $cmdarg
-    $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1
+for cmd in php php70 php71 php72; do
+  if which $cmd; then
+    $cmd %{_bindir}/phpunit6 --verbose || ret=1
   fi
 done
 exit $ret
@@ -166,6 +161,9 @@ exit $ret
 
 
 %changelog
+* Wed Jan 31 2018 Remi Collet <remi@remirepo.net> - 2.8.1-1
+- Update to 2.8.1
+
 * Tue Dec 12 2017 Remi Collet <remi@remirepo.net> - 2.8.0-2
 - switch from zend-loader to fedora/autoloader
 
-- 
cgit