diff --git a/.gitignore b/.gitignore index 7233795..69f9b43 100644 --- a/.gitignore +++ b/.gitignore @@ -16,8 +16,3 @@ clog /php-league-flysystem-1.0.64-d13c43d.tgz /php-league-flysystem-1.0.65-8f17b3b.tgz /php-league-flysystem-1.0.66-0215691.tgz -/php-league-flysystem-1.1.3-9be3b16.tgz -/php-league-flysystem-1.1.4-f3ad691.tgz -/php-league-flysystem-1.1.8-c995bb0.tgz -/php-league-flysystem-1.1.9-094defd.tgz -/php-league-flysystem-1.1.10-3239285.tgz diff --git a/php-league-flysystem.spec b/php-league-flysystem.spec index d1348b1..47764d6 100644 --- a/php-league-flysystem.spec +++ b/php-league-flysystem.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-league-flysystem # -# Copyright (c) 2016-2022 Remi Collet +# Copyright (c) 2016-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # # Github -%global gh_commit 3239285c825c152bcc315fe0e87d6b55f5972ed1 +%global gh_commit 021569195e15f8209b1c4bebb78bd66aa4f08c21 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner thephpleague %global gh_project flysystem @@ -19,8 +19,8 @@ %global ns_project Flysystem Name: php-%{pk_vendor}-%{pk_name} -Version: 1.1.10 -Release: 8%{?dist} +Version: 1.0.66 +Release: 1%{?dist} Summary: Filesystem abstraction: Many filesystems, one API License: MIT @@ -30,30 +30,29 @@ Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch +# As we use phpunit 6 and phpspec 5 BuildRequires: php(language) >= 7.2 -BuildRequires: php-fileinfo -BuildRequires: (php-composer(league/mime-type-detection) >= 1.3 with php-composer(league/mime-type-detection) < 2) BuildRequires: php-date +BuildRequires: php-fileinfo BuildRequires: php-ftp BuildRequires: php-hash BuildRequires: php-mbstring BuildRequires: php-pcre BuildRequires: php-spl # From composer.json, "require-dev": { -# "phpspec/prophecy": "^1.11.1", -# "phpunit/phpunit": "^8.5.8" -BuildRequires: phpunit8 >= 8.5.8 +# "phpspec/phpspec": "^3.4", +# "phpunit/phpunit": "^5.7.26" +BuildRequires: php-composer(phpspec/phpspec) >= 3.4 +BuildRequires: phpunit6 # Autoloader -BuildRequires: php-fedora-autoloader-devel +BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { -# "php": "^7.2.5 || ^8.0", -# "ext-fileinfo": "*", -# "league/mime-type-detection": "^1.3" -Requires: php(language) >= 7.2.5 +# "php": ">=5.5.9", +# "ext-fileinfo": "*" +Requires: php(language) >= 5.5.9 Requires: php-fileinfo -Requires: (php-composer(league/mime-type-detection) >= 1.3 with php-composer(league/mime-type-detection) < 2) -# From phpcompatifo report for 1.1.3 +# From phpcompatifo report for 1.0.49 Requires: php-date Requires: php-ftp Requires: php-hash @@ -78,18 +77,15 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php %build -: Create classmap autoloader -phpab \ - --template fedora \ - --output src/autoload.php \ - src +: Create autoloader +cat <<'AUTOLOAD' | tee src/autoload.php +>phpspec.yml + +PHPSPECVER=$(%{_bindir}/phpspec --version | sed 's/.* //;s/\..*//') +if [ "$PHPSPECVER" -lt 3 ] +then PHPSPEC=/dev/null +else PHPSPEC=%{_bindir}/phpspec +fi + ret=0 -for cmd in php php74 php80 php81 php82; do +for cmd in php php72 php73 php74; do if which $cmd; then : Run upstream test suite - $cmd %{_bindir}/phpunit8 \ + $cmd $PHPSPEC run || ret=1 + $cmd %{_bindir}/phpunit6 \ --exclude-group integration \ - --filter '^((?!(testPathinfoHandlesUtf8|testStreamSizeForUrl)).)*$' \ + --filter '^((?!(testPathinfoHandlesUtf8|testStreamSizeForUrl|testListingFromUnixFormat)).)*$' \ --no-coverage --verbose || ret=1 fi done @@ -127,65 +135,10 @@ exit $ret %license LICENSE %doc *.md %doc composer.json -%{_datadir}/php/%{ns_vendor}/%{ns_project} +%{_datadir}/php/%{ns_vendor} %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 1.1.10-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 1.1.10-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 1.1.10-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 1.1.10-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.1.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 1.1.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 1.1.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Oct 14 2022 Remi Collet - 1.1.10-1 -- update to 1.1.10 - -* Fri Jul 22 2022 Fedora Release Engineering - 1.1.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 1.1.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jan 5 2022 Remi Collet - 1.1.9-1 -- update to 1.1.9 - -* Tue Nov 30 2021 Remi Collet - 1.1.8-1 -- update to 1.1.8 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 25 2021 Remi Collet - 1.1.4-1 -- update to 1.1.4 - -* Wed Jan 27 2021 Fedora Release Engineering - 1.1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Aug 24 2020 Remi Collet - 1.1.3-1 -- update to 1.1.3 -- raise dependency on PHP 7.2 -- add dependency on league/mime-type-detection -- switch to classmap autoloader -- switch to phpunit8 - -* Tue Jul 28 2020 Fedora Release Engineering - 1.0.66-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - * Wed Mar 18 2020 Remi Collet - 1.0.66-1 - update to 1.0.66 @@ -195,9 +148,6 @@ exit $ret * Thu Feb 6 2020 Remi Collet - 1.0.64-1 - update to 1.0.64 -* Thu Jan 30 2020 Fedora Release Engineering - 1.0.63-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - * Mon Jan 6 2020 Remi Collet - 1.0.63-1 - update to 1.0.63 @@ -209,18 +159,10 @@ exit $ret * Sun Oct 13 2019 Remi Collet - 1.0.56-1 - update to 1.0.56 -- drop patch merged upstream - -* Fri Oct 11 2019 Remi Collet - 1.0.55-2 -- add patch for PHP 7.4 from - https://github.com/thephpleague/flysystem/pull/1081 * Mon Aug 26 2019 Remi Collet - 1.0.55-1 - update to 1.0.55 -* Fri Jul 26 2019 Fedora Release Engineering - 1.0.53-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Wed Jun 19 2019 Remi Collet - 1.0.53-1 - update to 1.0.53 diff --git a/sources b/sources index 4e7af3d..a3b1517 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-league-flysystem-1.1.10-3239285.tgz) = 9dea98cdeca4ec54eb2be4ecf2c5dc92098d91c09024704c4db4a1e6eed60bc127f1f0b5d7176db21f2efe53a849a5bc9bd824ef7b769df4168236f943af92df +SHA512 (php-league-flysystem-1.0.66-0215691.tgz) = 9c8335ffdfe1db788ec300d85863eec472140876eb5cb7bd0c74834f7bf77842cbb94bef9f15c13d2773adc773e30cad18612e6caa79494767e74718d97187ea