From 6f93e56523fa73e006454596d3d3d88425d7378e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 15 Oct 2018 10:51:19 +0200
Subject: update to 2.8.2 drop patch merged upstream

---
 466f249d772c188d1370545aba65bf0126bdfef0.patch | 23 -----------------------
 php-zendframework-zend-file.spec               | 13 +++++++------
 2 files changed, 7 insertions(+), 29 deletions(-)
 delete mode 100644 466f249d772c188d1370545aba65bf0126bdfef0.patch

diff --git a/466f249d772c188d1370545aba65bf0126bdfef0.patch b/466f249d772c188d1370545aba65bf0126bdfef0.patch
deleted file mode 100644
index 1e139ca..0000000
--- a/466f249d772c188d1370545aba65bf0126bdfef0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 466f249d772c188d1370545aba65bf0126bdfef0 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 15 Oct 2018 08:53:35 +0200
-Subject: [PATCH] Fix for PHP 7.3: "continue" targeting switch is equivalent to
- "break". Did you mean to use "continue 2"?
-
----
- src/Transfer/Adapter/AbstractAdapter.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Transfer/Adapter/AbstractAdapter.php b/src/Transfer/Adapter/AbstractAdapter.php
-index bc90dfe..48b615d 100644
---- a/src/Transfer/Adapter/AbstractAdapter.php
-+++ b/src/Transfer/Adapter/AbstractAdapter.php
-@@ -545,7 +545,7 @@ public function setOptions($options = [], $files = null)
-                             break;
- 
-                         default:
--                            continue;
-+                            break;
-                     }
-                 }
-             }
diff --git a/php-zendframework-zend-file.spec b/php-zendframework-zend-file.spec
index dbe4e4c..288b635 100644
--- a/php-zendframework-zend-file.spec
+++ b/php-zendframework-zend-file.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    4b2ecb77a9123a03cc648893b63e38b3735f192c
+%global gh_commit    d267733fbc3a15c9ca82708cf6e634e2fabb29e7
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-file
@@ -20,8 +20,8 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.8.1
-Release:        4%{?dist}
+Version:        2.8.2
+Release:        2%{?dist}
 Summary:        Zend Framework %{library} component
 
 License:        BSD
@@ -29,8 +29,6 @@ URL:            https://zendframework.github.io/%{gh_project}/
 Source0:        %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
-Patch0:         https://github.com/zendframework/zend-file/commit/466f249d772c188d1370545aba65bf0126bdfef0.patch
-
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
@@ -128,7 +126,6 @@ Documentation: https://zendframework.github.io/%{gh_project}/
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1
 
 mv LICENSE.md LICENSE
 
@@ -189,6 +186,10 @@ exit $ret
 
 
 %changelog
+* Mon Oct 15 2018 Remi Collet <remi@remirepo.net> - 2.8.2-2
+- update to 2.8.2
+- drop patch merged upstream
+
 * Mon Oct 15 2018 Remi Collet <remi@remirepo.net> - 2.8.1-4
 - add patch for PHP 7.3 from
   https://github.com/zendframework/zend-file/pull/45
-- 
cgit