From 69d2e578bdae64a93ad5ea733908955bf7af50d0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 8 Feb 2019 11:30:45 +0100
Subject: update to 1.1.6 drop patch merged upstream

---
 233.patch                          | 23 -----------------------
 php-alcaeus-mongo-php-adapter.spec | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 33 deletions(-)
 delete mode 100644 233.patch

diff --git a/233.patch b/233.patch
deleted file mode 100644
index 04b0869..0000000
--- a/233.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From b2b8c62209ebe051cddeb7b8fd3963b51a81a17e Mon Sep 17 00:00:00 2001
-From: Andreas Braun <git@alcaeus.org>
-Date: Sat, 7 Jul 2018 14:17:24 +0200
-Subject: [PATCH] Fix access to non-existing write results
-
-Fixes #231.
----
- lib/Alcaeus/MongoDbAdapter/ExceptionConverter.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/Alcaeus/MongoDbAdapter/ExceptionConverter.php b/lib/Alcaeus/MongoDbAdapter/ExceptionConverter.php
-index 8838a69..48b09de 100644
---- a/lib/Alcaeus/MongoDbAdapter/ExceptionConverter.php
-+++ b/lib/Alcaeus/MongoDbAdapter/ExceptionConverter.php
-@@ -45,7 +45,7 @@ public static function toLegacy(Exception\Exception $e, $fallbackClass = 'MongoE
-             case Exception\WriteException::class:
-                 $writeResult = $e->getWriteResult();
- 
--                if ($writeResult) {
-+                if ($writeResult && $writeResult->getWriteErrors() !== []) {
-                     $writeError = $writeResult->getWriteErrors()[0];
- 
-                     $message = $writeError->getMessage();
diff --git a/php-alcaeus-mongo-php-adapter.spec b/php-alcaeus-mongo-php-adapter.spec
index 8348ccd..738ca75 100644
--- a/php-alcaeus-mongo-php-adapter.spec
+++ b/php-alcaeus-mongo-php-adapter.spec
@@ -1,31 +1,28 @@
 # remirepo/fedora spec file for php-alcaeus-mongo-php-adapter
 #
-# Copyright (c) 2016-2018 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
 #
-%global gh_commit    4f21e1fdc21eee0e35bdaf854ecc3c58179d1ef7
+%global gh_commit    6111fb94e2e67b24b19681715f9caee4309e1eb5
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     alcaeus
 %global gh_project   mongo-php-adapter
 # disabled for https://fedoraproject.org/wiki/Changes/MongoDB_Removal
-%global with_tests   0
+%global with_tests   0%{?_with_tests:1}
 %global ns_vendor    Alcaeus
 
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        1.1.5
-Release:        5%{?dist}
+Version:        1.1.6
+Release:        1%{?dist}
 Summary:        Mongo PHP Adapter
 
-Group:          Development/Libraries
 License:        MIT
 URL:            https://github.com/%{gh_owner}/%{gh_project}
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{?gh_short}.tar.gz
-
-Patch0:         https://patch-diff.githubusercontent.com/raw/alcaeus/mongo-php-adapter/pull/233.patch
+Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}%{?prever}-%{?gh_short}.tar.gz
 
 BuildArch:      noarch
 BuildRequires:  php-fedora-autoloader-devel
@@ -79,7 +76,6 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/MongoDbAdapter/autoload.php
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1
 mv lib/Mongo  lib/%{ns_vendor}/Mongo
 
 
@@ -147,6 +143,10 @@ exit $ret
 
 
 %changelog
+* Fri Feb  8 2019 Remi Collet <remi@remirepo.net> - 1.1.6-1
+- update to 1.1.6
+- drop patch merged upstream
+
 * Tue Feb  5 2019 Remi Collet <remi@remirepo.net> - 1.1.5-5
 - disable test suite and so mongodb-server build dependency
   for https://fedoraproject.org/wiki/Changes/MongoDB_Removal
-- 
cgit