From b373a0acc373208ecb5a1028e7fc85066e8515d7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Feb 2017 16:28:47 +0100 Subject: [PATCH 1/8] update to 1.0.34 switch to fedora/autoloader --- .gitignore | 2 ++ php-league-flysystem.spec | 32 ++++++++++++++++++-------------- sources | 2 +- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 73ec195..7781130 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ /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 diff --git a/php-league-flysystem.spec b/php-league-flysystem.spec index f8ce47b..2053c1c 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 Remi Collet +# Copyright (c) 2016-2017 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # # Github -%global gh_commit 521a233642773505222a5dd53231ccf5b0607d5a +%global gh_commit 469ad53c13ea19a0e54e3e5d70f61227ddcc0299 %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.31 +Version: 1.0.34 Release: 1%{?dist} Summary: Filesystem abstraction: Many filesystems, one API @@ -29,8 +29,6 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz # Create git snapshot as tests are excluded from official tarball Source1: makesrc.sh -# Autoloader -Source2: %{name}-autoload.php BuildArch: noarch BuildRequires: php(language) >= 5.5.9 @@ -49,7 +47,7 @@ BuildRequires: php-composer(phpunit/phpunit) >= 4.0 BuildRequires: php-composer(mockery/mockery) >= 0.9 BuildRequires: php-composer(phpspec/phpspec) >= 2.2 # Autoloader -BuildRequires: php-composer(symfony/class-loader) +BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { Requires: php(language) >= 5.5.9 @@ -62,7 +60,7 @@ Requires: php-mbstring Requires: php-pcre Requires: php-spl # Autoloader -Requires: php-composer(symfony/class-loader) +Requires: php-composer(fedora/autoloader) Provides: php-composer(%{pk_vendor}/%{pk_name}) = %{version} @@ -77,11 +75,16 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -install -pm 644 %{SOURCE2} src/autoload.php - %build -# Nothing +: Create autoloader +cat <<'AUTOLOAD' | tee src/autoload.php +addPrefix("League\\Flysystem\\Stub\\", dirname(__DIR__).'/stub'); -$Loader->register(); +\Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\Stub\\', dirname(__DIR__).'/stub'); EOF : Fix bootstraping @@ -133,6 +133,10 @@ fi %changelog +* Wed Feb 1 2017 Remi Collet - 1.0.34-1 +- update to 1.0.34 +- switch to fedora/autoloader + * Wed Oct 19 2016 Remi Collet - 1.0.30-1 - update to 1.0.30 - lower dependency on PHP 5.5.9 diff --git a/sources b/sources index e09b237..6c34b4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -de002feb9667b1c31f18b5f67d4291cf php-league-flysystem-1.0.31-521a233.tgz +SHA512 (php-league-flysystem-1.0.34-469ad53.tgz) = 89dd45b356172b4b4cdce0b3e3c0de37f9a0c39177b2f4a669a316333dc81d3996244521bde691ffeb78b6cd8c495c8af6745ad4227ea53070449b1cf75985b6 From 87a3ee5fc9ef65a009a4d96b04a079fc61bb8f47 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Feb 2017 15:19:37 +0100 Subject: [PATCH 2/8] v1.0.35 (cherry picked from commit f0e0c7f7aa5cd6fd7c6cfb34cff9a2e6531a2ed2) --- .gitignore | 1 + php-league-flysystem.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7781130..c9c9553 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /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 diff --git a/php-league-flysystem.spec b/php-league-flysystem.spec index 2053c1c..64d4d7c 100644 --- a/php-league-flysystem.spec +++ b/php-league-flysystem.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit 469ad53c13ea19a0e54e3e5d70f61227ddcc0299 +%global gh_commit dda7f3ab94158a002d9846a97dc18ebfb7acc062 %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.34 +Version: 1.0.35 Release: 1%{?dist} Summary: Filesystem abstraction: Many filesystems, one API @@ -133,6 +133,9 @@ fi %changelog +* Thu Feb 9 2017 Remi Collet - 1.0.35-1 +- update to 1.0.35 + * Wed Feb 1 2017 Remi Collet - 1.0.34-1 - update to 1.0.34 - switch to fedora/autoloader diff --git a/sources b/sources index 6c34b4b..adc0cdf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-league-flysystem-1.0.34-469ad53.tgz) = 89dd45b356172b4b4cdce0b3e3c0de37f9a0c39177b2f4a669a316333dc81d3996244521bde691ffeb78b6cd8c495c8af6745ad4227ea53070449b1cf75985b6 +SHA512 (php-league-flysystem-1.0.35-dda7f3a.tgz) = a87620503e612a44ecb978e3f0ff52d13123096049044d155f66f0fb2c7674df1f32de97c6bb0e3c13a66048e5fe6cc6c3a8362f85cc5d3380b798ce10975e2d From 047ba86e63aaff012ff59930fcc49ed62ac72ce0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Mar 2017 07:28:08 +0100 Subject: [PATCH 3/8] v1.0.36 (cherry picked from commit 30ba250abf747fc91d6fc3db3281f78b4c61e688) --- .gitignore | 1 + php-league-flysystem.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c9c9553..3ac8c02 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /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 diff --git a/php-league-flysystem.spec b/php-league-flysystem.spec index 64d4d7c..2010399 100644 --- a/php-league-flysystem.spec +++ b/php-league-flysystem.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit dda7f3ab94158a002d9846a97dc18ebfb7acc062 +%global gh_commit d9c1698582dfbfbd092ec9c5c3325f862cdb3297 %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.35 +Version: 1.0.36 Release: 1%{?dist} Summary: Filesystem abstraction: Many filesystems, one API @@ -133,6 +133,9 @@ fi %changelog +* Mon Mar 20 2017 Remi Collet - 1.0.36-1 +- Update to 1.0.36 + * Thu Feb 9 2017 Remi Collet - 1.0.35-1 - update to 1.0.35 diff --git a/sources b/sources index adc0cdf..535a391 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-league-flysystem-1.0.35-dda7f3a.tgz) = a87620503e612a44ecb978e3f0ff52d13123096049044d155f66f0fb2c7674df1f32de97c6bb0e3c13a66048e5fe6cc6c3a8362f85cc5d3380b798ce10975e2d +SHA512 (php-league-flysystem-1.0.36-d9c1698.tgz) = fced3700d8098bde1c313ef8027b2e4f33de51439c7382a6d34a2de7dd6e8e19fd706c0b97647d8815eb4a9e8b06aac29e0bbc731615056367415c90b0f95ba2 From c3d4bbb66e3446a32ee64d0b3dc46f2149f0c4f0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Mar 2017 08:26:03 +0100 Subject: [PATCH 4/8] v1.0.37 (cherry picked from commit f650a87a5267183f6f8f8b04ebab63c2aec4b321) --- .gitignore | 1 + php-league-flysystem.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3ac8c02..8e0aebc 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /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 diff --git a/php-league-flysystem.spec b/php-league-flysystem.spec index 2010399..9e3402c 100644 --- a/php-league-flysystem.spec +++ b/php-league-flysystem.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit d9c1698582dfbfbd092ec9c5c3325f862cdb3297 +%global gh_commit 78b5cc4feb61a882302df4fbaf63b7662e5e4ccd %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.36 +Version: 1.0.37 Release: 1%{?dist} Summary: Filesystem abstraction: Many filesystems, one API @@ -133,6 +133,9 @@ fi %changelog +* Thu Mar 23 2017 Remi Collet - 1.0.37-1 +- Update to 1.0.37 + * Mon Mar 20 2017 Remi Collet - 1.0.36-1 - Update to 1.0.36 diff --git a/sources b/sources index 535a391..a9e3e8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-league-flysystem-1.0.36-d9c1698.tgz) = fced3700d8098bde1c313ef8027b2e4f33de51439c7382a6d34a2de7dd6e8e19fd706c0b97647d8815eb4a9e8b06aac29e0bbc731615056367415c90b0f95ba2 +SHA512 (php-league-flysystem-1.0.37-78b5cc4.tgz) = fa962343837c38a103cdf2689b36c35af05d04a0c00d018ebc32ce8a5af5944cdb9fc24381bd137a0b57ff93a55c638b021ec9abe105da6a00ef99fd2de4a90c From 4cd0b4f2654611ba81709a954bd2101541129368 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 24 Apr 2017 17:18:56 +0200 Subject: [PATCH 5/8] v1.0.38 (cherry picked from commit 801e24005d76dcf0bbcb1143697005f73ceae034) --- .gitignore | 1 + php-league-flysystem.spec | 20 ++++++++++++++------ sources | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 8e0aebc..301d387 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /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 diff --git a/php-league-flysystem.spec b/php-league-flysystem.spec index 9e3402c..b158162 100644 --- a/php-league-flysystem.spec +++ b/php-league-flysystem.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit 78b5cc4feb61a882302df4fbaf63b7662e5e4ccd +%global gh_commit 4ba6e13f5116204b21c3afdf400ecf2b9eb1c482 %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.37 +Version: 1.0.38 Release: 1%{?dist} Summary: Filesystem abstraction: Many filesystems, one API @@ -88,7 +88,6 @@ AUTOLOAD %install - # Restore PSR-0 tree mkdir -p %{buildroot}%{_datadir}/php/%{ns_vendor} cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project} @@ -119,9 +118,15 @@ then PHPSPEC=/dev/null else PHPSPEC=%{_bindir}/phpspec fi -: Run upstream test suite -%{_bindir}/php $PHPSPEC run -%{_bindir}/phpunit --verbose +ret=0 +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + : Run upstream test suite with PHP 5 + $cmd $PHPSPEC run || ret=1 + $cmd %{_bindir}/phpunit --verbose || ret=1 + fi +done +exit $ret %files @@ -133,6 +138,9 @@ fi %changelog +* Mon Apr 24 2017 Remi Collet - 1.0.38-1 +- Update to 1.0.38 + * Thu Mar 23 2017 Remi Collet - 1.0.37-1 - Update to 1.0.37 diff --git a/sources b/sources index a9e3e8a..a82682f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-league-flysystem-1.0.37-78b5cc4.tgz) = fa962343837c38a103cdf2689b36c35af05d04a0c00d018ebc32ce8a5af5944cdb9fc24381bd137a0b57ff93a55c638b021ec9abe105da6a00ef99fd2de4a90c +SHA512 (php-league-flysystem-1.0.38-4ba6e13.tgz) = 3c1b210f5225379ad2ac77f2094d33e1c29df1b87a596f1ee4df86d3ad0c3991f85d03b370adceaf89d176d77a3c732b12b74a2ae2a9481400ff94d91b226324 From 3f71cbc0b3d1edaaf80603b65987225a75fb566f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 26 Apr 2017 09:41:09 +0200 Subject: [PATCH 6/8] v1.0.39 (cherry picked from commit efcac19bb4d8586444d2480ad98016e30f77abd2) --- .gitignore | 1 + php-league-flysystem.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 301d387..5bd86fb 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /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 diff --git a/php-league-flysystem.spec b/php-league-flysystem.spec index b158162..e036ff4 100644 --- a/php-league-flysystem.spec +++ b/php-league-flysystem.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit 4ba6e13f5116204b21c3afdf400ecf2b9eb1c482 +%global gh_commit 2474325ee924134bb05848663b12531f6f2e9fbe %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.38 +Version: 1.0.39 Release: 1%{?dist} Summary: Filesystem abstraction: Many filesystems, one API @@ -138,6 +138,9 @@ exit $ret %changelog +* Wed Apr 26 2017 Remi Collet - 1.0.39-1 +- Update to 1.0.39 + * Mon Apr 24 2017 Remi Collet - 1.0.38-1 - Update to 1.0.38 diff --git a/sources b/sources index a82682f..56cefef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-league-flysystem-1.0.38-4ba6e13.tgz) = 3c1b210f5225379ad2ac77f2094d33e1c29df1b87a596f1ee4df86d3ad0c3991f85d03b370adceaf89d176d77a3c732b12b74a2ae2a9481400ff94d91b226324 +SHA512 (php-league-flysystem-1.0.39-2474325.tgz) = 1838c794a231bfdf00c13fd3d452c659cf5032166f4212365fcbc904424a361c6233232e5295e19fe77f42470eeeb08746d88503e86849fb9feac7cd46a593f3 From 83b8a8c11cdacca8d32d55c08c767155aadbe23d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 28 Apr 2017 16:48:12 +0200 Subject: [PATCH 7/8] v1.0.40 (cherry picked from commit 07aab4564f91e6da0d60a9c9904d904dfc9e666c) --- .gitignore | 1 + php-league-flysystem.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5bd86fb..2fe4903 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /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 diff --git a/php-league-flysystem.spec b/php-league-flysystem.spec index e036ff4..40c62a4 100644 --- a/php-league-flysystem.spec +++ b/php-league-flysystem.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit 2474325ee924134bb05848663b12531f6f2e9fbe +%global gh_commit 3828f0b24e2c1918bb362d57a53205d6dc8fde61 %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.39 +Version: 1.0.40 Release: 1%{?dist} Summary: Filesystem abstraction: Many filesystems, one API @@ -138,6 +138,9 @@ exit $ret %changelog +* Fri Apr 28 2017 Remi Collet - 1.0.40-1 +- Update to 1.0.40 + * Wed Apr 26 2017 Remi Collet - 1.0.39-1 - Update to 1.0.39 diff --git a/sources b/sources index 56cefef..acea5ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-league-flysystem-1.0.39-2474325.tgz) = 1838c794a231bfdf00c13fd3d452c659cf5032166f4212365fcbc904424a361c6233232e5295e19fe77f42470eeeb08746d88503e86849fb9feac7cd46a593f3 +SHA512 (php-league-flysystem-1.0.40-3828f0b.tgz) = 405b5e99a2ad462b2ea5b7fb3d8086c4bae9643da45b2d46947cd8e5117ac77318dd87ce2a85896ad862039efa8ae713f8669acdf683efe0e3da0702a5d64a22 From e1fd0ae2c416ef9b124016c97d6adaee32a58c4f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Aug 2017 08:28:39 +0200 Subject: [PATCH 8/8] v1.0.41 (cherry picked from commit 512bed24f08f19b9c54bcf0231a25ab984893e19) (cherry picked from commit 7aa0027835f529d26bfb321b1403f14b85a1bea5) --- .gitignore | 1 + php-league-flysystem.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2fe4903..bc97d92 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /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 diff --git a/php-league-flysystem.spec b/php-league-flysystem.spec index 40c62a4..8a2726a 100644 --- a/php-league-flysystem.spec +++ b/php-league-flysystem.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit 3828f0b24e2c1918bb362d57a53205d6dc8fde61 +%global gh_commit f400aa98912c561ba625ea4065031b7a41e5a155 %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.40 +Version: 1.0.41 Release: 1%{?dist} Summary: Filesystem abstraction: Many filesystems, one API @@ -138,6 +138,9 @@ exit $ret %changelog +* Mon Aug 7 2017 Remi Collet - 1.0.41-1 +- Update to 1.0.41 + * Fri Apr 28 2017 Remi Collet - 1.0.40-1 - Update to 1.0.40 diff --git a/sources b/sources index acea5ff..af41112 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-league-flysystem-1.0.40-3828f0b.tgz) = 405b5e99a2ad462b2ea5b7fb3d8086c4bae9643da45b2d46947cd8e5117ac77318dd87ce2a85896ad862039efa8ae713f8669acdf683efe0e3da0702a5d64a22 +SHA512 (php-league-flysystem-1.0.41-f400aa9.tgz) = af96dfe42050e53a985d8056da9da91f5c359cd4df2d77623dd9f8885c8feabe320c6e062362f5d54c82aecbbcc5493d17ad940446f83843ac2847651b093962