From 47656420c8a2ff2bfaadda74e1cb7e435f85cd8b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 Aug 2018 11:47:01 +0200 Subject: [PATCH] v1.0.46 (cherry picked from commit 489ead125a2502033eb4ee96687899dcba19a230) --- .gitignore | 1 + php-league-flysystem.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 7dc8685..44df4c4 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /php-league-flysystem-1.0.43-1ce7cc1.tgz /php-league-flysystem-1.0.44-168dbe5.tgz /php-league-flysystem-1.0.45-a99f94e.tgz +/php-league-flysystem-1.0.46-f3e0d92.tgz diff --git a/php-league-flysystem.spec b/php-league-flysystem.spec index d32b05d..909e07c 100644 --- a/php-league-flysystem.spec +++ b/php-league-flysystem.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit a99f94e63b512d75f851b181afcdf0ee9ebef7e6 +%global gh_commit f3e0d925c18b92cf3ce84ea5cc58d62a1762a2b2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner thephpleague %global gh_project flysystem @@ -19,7 +19,7 @@ %global ns_project Flysystem Name: php-%{pk_vendor}-%{pk_name} -Version: 1.0.45 +Version: 1.0.46 Release: 1%{?dist} Summary: Filesystem abstraction: Many filesystems, one API @@ -30,8 +30,8 @@ Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -# As we use phpunit 6 and phpspec 4 -BuildRequires: php(language) >= 7 +# As we use phpunit 6 and phpspec 5 +BuildRequires: php(language) >= 7.1 BuildRequires: php-date BuildRequires: php-fileinfo BuildRequires: php-ftp @@ -41,7 +41,7 @@ BuildRequires: php-pcre BuildRequires: php-spl # From composer.json, "require-dev": { # "phpspec/phpspec": "^3.4", -# "phpunit/phpunit": "^5.7" +# "phpunit/phpunit": "^5.7.10" BuildRequires: php-composer(phpspec/phpspec) >= 3.4 BuildRequires: phpunit6 # Autoloader @@ -118,7 +118,7 @@ fi sed -e 's/testPathinfoHandlesUtf8/skipPathinfoHandlesUtf8/' -i tests/UtilTests.php ret=0 -for cmd in php php70 php71 php72; do +for cmd in php php71 php72 php73; do if which $cmd; then : Run upstream test suite $cmd $PHPSPEC run || ret=1 @@ -137,6 +137,9 @@ exit $ret %changelog +* Wed Aug 22 2018 Remi Collet - 1.0.46-1 +- update to 1.0.46 + * Mon May 14 2018 Remi Collet - 1.0.45-1 - update to 1.0.45 diff --git a/sources b/sources index e2b05e2..dcc19b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-league-flysystem-1.0.45-a99f94e.tgz) = 71c03d6ab2a244266df0fe4289eeebcfd29a22231b44a0c30df2a0a1b1380e262e3dd15a76822406e39a4bf13988586b18068879b10498734267a491a5b5e121 +SHA512 (php-league-flysystem-1.0.46-f3e0d92.tgz) = c9bc98c97064bc66b8f5f2f23004859546b9617cc915751c9dc5c7b79a381ef84f3287f9a4ac2a6e1b8eff16b5724e0ad27aa91507cf889964841bde35df103d