From 47f0ceaf8b9a72bfafbb5bf3b25f57a9ee4e6ca6 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 26 Apr 2018 14:44:22 +0200
Subject: update to 2.8.0 raise dependency on PHP 5.6 raise dependency on
zend-stdlib 2.7.7 switch to phpunit7 use range dependencies
---
php-zendframework-zend-file.spec | 90 +++++++++++++++++++++++++++-------------
1 file changed, 61 insertions(+), 29 deletions(-)
(limited to 'php-zendframework-zend-file.spec')
diff --git a/php-zendframework-zend-file.spec b/php-zendframework-zend-file.spec
index d78bdc8..aca451d 100644
--- a/php-zendframework-zend-file.spec
+++ b/php-zendframework-zend-file.spec
@@ -1,13 +1,13 @@
# remirepo/Fedora spec file for php-zendframework-zend-file
#
-# 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 888fd4852432ee61ffd48a66b6812387b4f83c02
+%global gh_commit 28ec81a9147cd76b9d6cdce519ce96858fbab5f0
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner zendframework
%global gh_project zend-file
@@ -20,11 +20,10 @@
%endif
Name: php-%{gh_owner}-%{gh_project}
-Version: 2.7.1
-Release: 4%{?dist}
+Version: 2.8.0
+Release: 2%{?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
@@ -33,51 +32,76 @@ Source1: makesrc.sh
BuildArch: noarch
# Tests
%if %{with_tests}
-BuildRequires: php(language) >= 5.5
+BuildRequires: php(language) >= 5.6
BuildRequires: php-fileinfo
BuildRequires: php-hash
BuildRequires: php-pcre
BuildRequires: php-spl
BuildRequires: php-tokenizer
-BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.5
# From composer, "require-dev": {
-# "fabpot/php-cs-fixer": "1.7.*",
-# "phpunit/phpunit": "~4.0",
+# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
# "zendframework/zend-coding-standard": "~1.0.0",
-# "zendframework/zend-filter": "^2.6.1",
-# "zendframework/zend-i18n": "^2.6",
+# "zendframework/zend-filter": "^2.7.2",
+# "zendframework/zend-i18n": "^2.7.4",
# "zendframework/zend-progressbar": "^2.5.2",
-# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-# "zendframework/zend-session": "^2.6.2",
-# "zendframework/zend-validator": "^2.6"
-BuildRequires: php-autoloader(%{gh_owner}/zend-filter) >= 2.6.1
-BuildRequires: php-autoloader(%{gh_owner}/zend-i18n) >= 2.6
+# "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
+# "zendframework/zend-session": "^2.8",
+# "zendframework/zend-validator": "^2.10.1"
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-filter) >= 2.7.2 with php-autoloader(%{gh_owner}/zend-filter) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-i18n) >= 2.7.4 with php-autoloader(%{gh_owner}/zend-i18n) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-progressbar) >= 2.5.2 with php-autoloader(%{gh_owner}/zend-progressbar) < 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-session) >= 2.8 with php-autoloader(%{gh_owner}/zend-session) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/zend-validator) < 3)
+%global phpunit %{_bindir}/phpunit7
+BuildRequires: phpunit7 >= 7.1.2
+# remirepo:18
+%else
+BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4
+BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.7
+BuildRequires: php-autoloader(%{gh_owner}/zend-filter) < 3
+BuildRequires: php-autoloader(%{gh_owner}/zend-filter) >= 2.7.2
+BuildRequires: php-autoloader(%{gh_owner}/zend-i18n) < 3
+BuildRequires: php-autoloader(%{gh_owner}/zend-i18n) >= 2.7.4
+BuildRequires: php-autoloader(%{gh_owner}/zend-progressbar) < 3
BuildRequires: php-autoloader(%{gh_owner}/zend-progressbar) >= 2.5.2
-BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5
-BuildRequires: php-autoloader(%{gh_owner}/zend-session) >= 2.6.2
-BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.6
-BuildRequires: php-composer(phpunit/phpunit) >= 4.0
+BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4
+BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.8
+BuildRequires: php-autoloader(%{gh_owner}/zend-session) < 3
+BuildRequires: php-autoloader(%{gh_owner}/zend-session) >= 2.8
+BuildRequires: php-autoloader(%{gh_owner}/zend-validator) < 3
+BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1
+%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",
-# "zendframework/zend-stdlib": "^2.7 || ^3.0"
-Requires: php(language) >= 5.5
+# "php": "^5.6 || ^7.0",
+# "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
+Requires: php(language) >= 5.6
%if ! %{bootstrap}
-Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4)
+# remirepo:4
+%else
Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4
+Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.7
+%endif
# From composer, "suggest": {
# "zendframework/zend-filter": "Zend\\Filter component",
# "zendframework/zend-i18n": "Zend\\I18n component",
# "zendframework/zend-validator": "Zend\\Validator component"
-%if 0%{?fedora} >= 21
Suggests: php-autoloader(%{gh_owner}/zend-filter)
Suggests: php-autoloader(%{gh_owner}/zend-i18n)
Suggests: php-autoloader(%{gh_owner}/zend-validator)
%endif
-%endif
# Autoloader
Requires: php-composer(fedora/autoloader)
# From phpcompatinfo report for version 2.6.0
@@ -141,9 +165,10 @@ require_once '%{buildroot}%{php_home}/Zend/%{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
@@ -161,6 +186,13 @@ exit $ret
%changelog
+* Thu Apr 26 2018 Remi Collet <remi@remirepo.net> - 2.8.0-2
+- update to 2.8.0
+- raise dependency on PHP 5.6
+- raise dependency on zend-stdlib 2.7.7
+- switch to phpunit7
+- use range dependencies
+
* Mon Dec 11 2017 Remi Collet <remi@remirepo.net> - 2.7.1-4
- switch from zend-loader to fedora/autoloader
--
cgit