From d28e038a357e7d509c1c6978475e07964089fbe5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 19 Jun 2019 09:05:22 +0200 Subject: sync with Fedora --- php-league-climate.spec | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'php-league-climate.spec') diff --git a/php-league-climate.spec b/php-league-climate.spec index bf17700..bf0fe39 100644 --- a/php-league-climate.spec +++ b/php-league-climate.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-league-climate # -# Copyright (c) 2016-2018 Shawn Iwinski +# Copyright (c) 2016-2019 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -12,20 +12,21 @@ %global github_owner thephpleague %global github_name climate -%global github_version 3.4.1 -%global github_commit d657a19837c1f79a891381fb128b755aa3386381 +%global github_version 3.5.0 +%global github_commit 0d2fdbf8829f60f6ba6433df68d6f3fe1271b8e6 %global composer_vendor league %global composer_project climate -# "php": "^5.6|^7.0" -%global php_min_ver 5.6.0 +# "php": "^7.1" +%global php_min_ver 7.1 # "mikey179/vfsStream": "^1.4" # NOTE: Min version not 1.4 because autoloader required %global vfsstream_min_ver 1.6.0 %global vfsstream_max_ver 2.0 # "mockery/mockery": "^1.0" -%global mockery_min_ver 1.0 +# NOTE: Min version not 1.0 because tests pass with 0.9 version available +%global mockery_min_ver 0.9.3 %global mockery_max_ver 2.0 # "psr/log": "^1.0" %global psr_log_min_ver 1.0 @@ -44,7 +45,6 @@ Version: %{github_version} Release: 1%{?github_release}%{?dist} Summary: Allows you to easily output colored text, special formats, and more -Group: Development/Libraries License: MIT URL: http://climate.thephpleague.com/ @@ -157,7 +157,10 @@ require_once '%{buildroot}%{phpdir}/League/CLImate/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('League\\CLImate\\Tests\\', __DIR__.'/tests'); \Fedora\Autoloader\Dependencies::required(array( - '%{phpdir}/Mockery1/autoload.php', + array( + '%{phpdir}/Mockery1/autoload.php', + '%{phpdir}/Mockery/autoload.php', + ), '%{phpdir}/org/bovigo/vfs/autoload.php', )); BOOTSTRAP @@ -168,7 +171,7 @@ sed '/require.*vendor\/mikey179/d' -i tests/FileTest.php : Upstream tests RETURN_CODE=0 PHPUNIT=$(which phpunit) -for PHP_EXEC in "" php70 php71 php72; do +for PHP_EXEC in "" php72 php73 php74; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \ || RETURN_CODE=1 @@ -191,6 +194,9 @@ exit $RETURN_CODE %changelog +* Sat Jun 15 2019 Shawn Iwinski - 3.5.0-1 +- Update to 3.5.0 (RHBZ #1674287) + * Mon May 14 2018 Remi Collet - 3.4.1-1 - use php-mockery (v1) instead of old 0.9 -- cgit