diff options
| -rw-r--r-- | 1081.patch | 22 | ||||
| -rw-r--r-- | php-league-flysystem.spec | 13 |
2 files changed, 7 insertions, 28 deletions
diff --git a/1081.patch b/1081.patch deleted file mode 100644 index 71c0dd4..0000000 --- a/1081.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 1c4f297d30f51493c6ed54c827ad85132b3c8f61 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Fri, 11 Oct 2019 12:00:18 +0200 -Subject: [PATCH] add 'application/x-empty' for 7.4 - ---- - src/Adapter/Local.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Adapter/Local.php b/src/Adapter/Local.php -index 3236349a..c6e6fa86 100644 ---- a/src/Adapter/Local.php -+++ b/src/Adapter/Local.php -@@ -319,7 +319,7 @@ public function getMimetype($path) - $finfo = new Finfo(FILEINFO_MIME_TYPE); - $mimetype = $finfo->file($location); - -- if (in_array($mimetype, ['application/octet-stream', 'inode/x-empty'])) { -+ if (in_array($mimetype, ['application/octet-stream', 'inode/x-empty', 'application/x-empty'])) { - $mimetype = Util\MimeType::detectByFilename($location); - } - diff --git a/php-league-flysystem.spec b/php-league-flysystem.spec index 4f13b54..186aba7 100644 --- a/php-league-flysystem.spec +++ b/php-league-flysystem.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit 33c91155537c6dc899eacdc54a13ac6303f156e6 +%global gh_commit 90e3f83cb10ef6b058d70f95267030e7a6236518 %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.0.55 -Release: 2%{?dist} +Version: 1.0.56 +Release: 1%{?dist} Summary: Filesystem abstraction: Many filesystems, one API License: MIT @@ -29,8 +29,6 @@ Source0: %{name}-%{version}-%{gh_short}.tgz # Create git snapshot as tests are excluded from official tarball Source1: makesrc.sh -Patch0: https://patch-diff.githubusercontent.com/raw/thephpleague/flysystem/pull/1081.patch - BuildArch: noarch # As we use phpunit 6 and phpspec 5 BuildRequires: php(language) >= 7.1 @@ -76,7 +74,6 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 %build @@ -142,6 +139,10 @@ exit $ret %changelog +* Sun Oct 13 2019 Remi Collet <remi@remirepo.net> - 1.0.56-1 +- update to 1.0.56 +- drop patch merged upstream + * Fri Oct 11 2019 Remi Collet <remi@remirepo.net> - 1.0.55-2 - add patch for PHP 7.4 from https://github.com/thephpleague/flysystem/pull/1081 |