From c31ef00293a84850f7603dcbdfcee77db564e8e8 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 3 May 2018 08:05:18 +0200
Subject: update to 2.7.0 raise dependency on PHP 5.6 use range dependencies on
 F27+ switch to phpunit6 or phpunit7

---
 php-zendframework-zend-permissions-acl.spec | 45 +++++++++++++++++++----------
 1 file changed, 30 insertions(+), 15 deletions(-)

(limited to 'php-zendframework-zend-permissions-acl.spec')

diff --git a/php-zendframework-zend-permissions-acl.spec b/php-zendframework-zend-permissions-acl.spec
index dab9c8b..21b16bf 100644
--- a/php-zendframework-zend-permissions-acl.spec
+++ b/php-zendframework-zend-permissions-acl.spec
@@ -1,13 +1,13 @@
 # remirepo/Fedora spec file for zend-permissions-acl
 #
-# 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    843bbd9c6f6d20b84dd0ce6c815d10397e98082b
+%global gh_commit    c9568f4aee2887e43bf07769973f9686e8f61707
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-permissions-acl
@@ -20,8 +20,8 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.6.0
-Release:        4%{?dist}
+Version:        2.7.0
+Release:        2%{?dist}
 Summary:        Zend Framework Permissions-%{library} component
 
 Group:          Development/Libraries
@@ -33,30 +33,38 @@ Source1:        makesrc.sh
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
-BuildRequires:  php(language) >= 5.5
+BuildRequires:  php(language) >= 5.6
 BuildRequires:  php-spl
 # From composer, "require-dev": {
-#        "fabpot/php-cs-fixer": "1.7.*",
-#        "phpunit/PHPUnit": "~4.0",
+#        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5",
+#        "zendframework/zend-coding-standard": "~1.0.0",
 #        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4)
+%global phpunit %{_bindir}/phpunit7
+BuildRequires:  phpunit7 >= 7.1.4
+# remirepo:6
+%else
+BuildRequires:  php-autoloader(%{gh_owner}/zend-servicemanager) <  4
 BuildRequires:  php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5
-BuildRequires:  php-composer(phpunit/phpunit)                   >= 4.0
+%global phpunit %{_bindir}/phpunit6
+BuildRequires:  phpunit6 >= 6.5.8
+%endif
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^5.5 || ^7.0"
-Requires:       php(language) >= 5.5
+#        "php": "^5.6 || ^7.0"
+Requires:       php(language) >= 5.6
 %if ! %{bootstrap}
 # From composer, "suggest": {
 #        "zendframework/zend-servicemanager": "To support Zend\\Permissions\\Acl\\Assertion\\AssertionManager plugin manager usage"
-%if 0%{?fedora} >= 21
 Suggests:       php-autoloader(%{gh_owner}/zend-servicemanager)
 %endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
-%endif
 # From phpcompatinfo report for version 2.5.1
 Requires:       php-spl
 
@@ -103,9 +111,10 @@ require_once '%{buildroot}%{php_home}/Zend/Permissions/%{library}/autoload.php';
 EOF
 
 ret=0
-for cmd in php php56 php70 php71 php72; do
-  if which $cmd; then
-    $cmd %{_bindir}/phpunit || ret=1
+for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72; do
+  if which $cmdarg; then
+    set $cmdarg
+    $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1
   fi
 done
 exit $ret
@@ -125,6 +134,12 @@ exit $ret
 
 
 %changelog
+* Thu May  3 2018 Remi Collet <remi@remirepo.net> - 2.7.0-2
+- update to 2.7.0
+- raise dependency on PHP 5.6
+- use range dependencies on F27+
+- switch to phpunit6 or phpunit7
+
 * Mon Dec 11 2017 Remi Collet <remi@remirepo.net> - 2.6.0-4
 - switch from zend-loader to fedora/autoloader
 
-- 
cgit