diff --git a/.gitignore b/.gitignore index 7233795..e269ecc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,23 @@ -clog -/php-league-flysystem-1.0.45-a99f94e.tgz -/php-league-flysystem-1.0.46-f3e0d92.tgz -/php-league-flysystem-1.0.47-a11e4a7.tgz -/php-league-flysystem-1.0.48-a6ded5b.tgz -/php-league-flysystem-1.0.49-a63cc83.tgz -/php-league-flysystem-1.0.50-dab4e76.tgz -/php-league-flysystem-1.0.51-755ba7b.tgz -/php-league-flysystem-1.0.52-c5a5097.tgz -/php-league-flysystem-1.0.53-08e12b7.tgz -/php-league-flysystem-1.0.55-33c9115.tgz -/php-league-flysystem-1.0.56-90e3f83.tgz -/php-league-flysystem-1.0.57-0e9db7f.tgz -/php-league-flysystem-1.0.61-4fb13c0.tgz -/php-league-flysystem-1.0.63-8132dae.tgz -/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 +/php-league-flysystem-1.0.16-183e1a6.tgz +/php-league-flysystem-1.0.17-02f5b6c.tgz +/php-league-flysystem-1.0.18-b334d6c.tgz +/php-league-flysystem-1.0.20-e87a786.tgz +/php-league-flysystem-1.0.21-35a83cf.tgz +/php-league-flysystem-1.0.22-bd73a91.tgz +/php-league-flysystem-1.0.24-9aca859.tgz +/php-league-flysystem-1.0.25-a76afa4.tgz +/php-league-flysystem-1.0.26-fb3b30d.tgz +/php-league-flysystem-1.0.27-50e2045.tgz +/php-league-flysystem-1.0.28-a966364.tgz +/php-league-flysystem-1.0.29-b732cc9.tgz +/php-league-flysystem-1.0.31-521a233.tgz +/php-league-flysystem-1.0.33-5c7f984.tgz +/php-league-flysystem-1.0.34-469ad53.tgz +/php-league-flysystem-1.0.35-dda7f3a.tgz +/php-league-flysystem-1.0.36-d9c1698.tgz +/php-league-flysystem-1.0.37-78b5cc4.tgz +/php-league-flysystem-1.0.38-4ba6e13.tgz +/php-league-flysystem-1.0.39-2474325.tgz +/php-league-flysystem-1.0.40-3828f0b.tgz +/php-league-flysystem-1.0.41-f400aa9.tgz +/php-league-flysystem-1.0.42-09eabc5.tgz diff --git a/php-league-flysystem.spec b/php-league-flysystem.spec index d1348b1..aa6e01e 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-2018 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 09eabc54e199950041aef258a85847676496fe8e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner thephpleague %global gh_project flysystem @@ -19,10 +19,11 @@ %global ns_project Flysystem Name: php-%{pk_vendor}-%{pk_name} -Version: 1.1.10 -Release: 8%{?dist} +Version: 1.0.42 +Release: 1%{?dist} Summary: Filesystem abstraction: Many filesystems, one API +Group: Development/Libraries License: MIT URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz @@ -30,31 +31,28 @@ Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -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) +# As we use phpunit 6 and phpspec 4 +BuildRequires: php(language) >= 7 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" +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 -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 +Requires: php(language) >= 5.5.9 +# From phpcompatifo report for 1.0.29 Requires: php-date +Requires: php-fileinfo Requires: php-ftp Requires: php-hash Requires: php-mbstring @@ -78,18 +76,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 + +# Known to fail test +sed -e 's/testPathinfoHandlesUtf8/skipPathinfoHandlesUtf8/' -i tests/UtilTests.php + ret=0 -for cmd in php php74 php80 php81 php82; do +for cmd in php php70 php71 php72; do if which $cmd; then : Run upstream test suite - $cmd %{_bindir}/phpunit8 \ - --exclude-group integration \ - --filter '^((?!(testPathinfoHandlesUtf8|testStreamSizeForUrl)).)*$' \ - --no-coverage --verbose || ret=1 + $cmd $PHPSPEC run || ret=1 + $cmd %{_bindir}/phpunit6 --exclude-group integration --no-coverage --verbose || ret=1 fi done exit $ret @@ -127,139 +134,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 - -* Mon Mar 9 2020 Remi Collet - 1.0.65-1 -- update to 1.0.65 - -* 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 - -* Mon Dec 9 2019 Remi Collet - 1.0.61-1 -- update to 1.0.61 - -* Thu Oct 17 2019 Remi Collet - 1.0.57-1 -- update to 1.0.57 - -* 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 - -* Tue May 21 2019 Remi Collet - 1.0.52-1 -- update to 1.0.52 - -* Mon Apr 1 2019 Remi Collet - 1.0.51-1 -- update to 1.0.51 - -* Fri Feb 1 2019 Remi Collet - 1.0.50-1 -- update to 1.0.50 - -* Mon Nov 26 2018 Remi Collet - 1.0.49-1 -- update to 1.0.49 - -* Tue Oct 16 2018 Remi Collet - 1.0.48-1 -- update to 1.0.48 - -* Sat Sep 15 2018 Remi Collet - 1.0.47-1 -- update to 1.0.47 - -* Wed Aug 22 2018 Remi Collet - 1.0.46-1 -- update to 1.0.46 - -* Fri Jul 13 2018 Fedora Release Engineering - 1.0.45-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon May 14 2018 Remi Collet - 1.0.45-1 -- update to 1.0.45 - -* Mon Apr 9 2018 Remi Collet - 1.0.44-1 -- update to 1.0.44 - -* Thu Mar 1 2018 Remi Collet - 1.0.43-1 -- Update to 1.0.43 - -* Fri Feb 09 2018 Fedora Release Engineering - 1.0.42-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - * Mon Jan 29 2018 Remi Collet - 1.0.42-1 - Update to 1.0.42 - switch to phpunit 6 and phpspec 4 @@ -267,9 +145,6 @@ exit $ret * Mon Aug 7 2017 Remi Collet - 1.0.41-1 - Update to 1.0.41 -* Thu Jul 27 2017 Fedora Release Engineering - 1.0.40-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - * Fri Apr 28 2017 Remi Collet - 1.0.40-1 - Update to 1.0.40 diff --git a/sources b/sources index 4e7af3d..12074c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-league-flysystem-1.1.10-3239285.tgz) = 9dea98cdeca4ec54eb2be4ecf2c5dc92098d91c09024704c4db4a1e6eed60bc127f1f0b5d7176db21f2efe53a849a5bc9bd824ef7b769df4168236f943af92df +SHA512 (php-league-flysystem-1.0.42-09eabc5.tgz) = 808b68a02a5b8db0506a00cbd8cab98410295fd95c36b0c53c2d5481c3cfc1477f2778f41d0cc388925201e4e6a5c065d20cb3a4fc63c71c08cc7304ec863879