From 1b3cb87cf9c9b2975737afc500ad5391cd6fe809 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Jul 24 2020 06:21:09 +0000
Subject: add upstream patch for latest sphinx


---

diff --git a/mongo-c-driver-upstream.patch b/mongo-c-driver-upstream.patch
new file mode 100644
index 0000000..641cc95
--- /dev/null
+++ b/mongo-c-driver-upstream.patch
@@ -0,0 +1,31 @@
+Fix for latest sphinx from upstream
+
+
+From 69eef997e71cb1478b50604f97bb64427e31d59a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Roberto=20C=2E=20S=C3=A1nchez?= <roberto@connexer.com>
+Date: Tue, 7 Jul 2020 16:56:11 -0400
+Subject: [PATCH] CDRIVER-3509 fix rpm-package-build task
+
+---
+ .evergreen/build_snapshot_rpm.sh | 34 ++++++++++++++--------------
+ .evergreen/spec.patch            | 38 +++++++++++++++++++++++++++-----
+ build/sphinx/taglist.py          |  5 ++++-
+ src/libbson/doc/taglist.py       |  5 ++++-
+ 4 files changed, 57 insertions(+), 25 deletions(-)
+
+diff --git a/build/sphinx/taglist.py b/build/sphinx/taglist.py
+index 954d0502c6..6b324eb16d 100755
+--- a/build/sphinx/taglist.py
++++ b/build/sphinx/taglist.py
+@@ -24,7 +24,10 @@
+ """
+ 
+ from docutils import nodes, utils
+-from sphinx.environment import NoUri
++try:
++    from sphinx.environment import NoUri
++except ImportError:
++    from sphinx.errors import NoUri
+ try:
+     from sphinx.util.compat import Directive
+ except ImportError:
diff --git a/mongo-c-driver.spec b/mongo-c-driver.spec
index 96d8622..8e9800d 100644
--- a/mongo-c-driver.spec
+++ b/mongo-c-driver.spec
@@ -25,6 +25,8 @@ URL:       https://github.com/%{gh_owner}/%{gh_project}
 
 Source0:   https://github.com/%{gh_owner}/%{gh_project}/releases/download/%{up_version}%{?up_prever:-%{up_prever}}/%{gh_project}-%{up_version}%{?up_prever:-%{up_prever}}.tar.gz
 
+Patch0:    %{name}-upstream.patch
+
 BuildRequires: cmake >= 3.1
 BuildRequires: gcc
 # pkg-config may pull compat-openssl10
@@ -105,6 +107,7 @@ Documentation: http://mongoc.org/libbson/%{version}/
 
 %prep
 %setup -q -n %{gh_project}-%{up_version}%{?up_prever:-%{up_prever}}
+%patch0 -p1
 
 
 %build
@@ -127,12 +130,12 @@ Documentation: http://mongoc.org/libbson/%{version}/
 %endif
     -DENABLE_EXAMPLES:BOOL=OFF \
     -DENABLE_UNINSTALL:BOOL=OFF \
-    -DENABLE_CLIENT_SIDE_ENCRYPTION:BOOL=ON
+    -DENABLE_CLIENT_SIDE_ENCRYPTION:BOOL=ON \
+    -S .
 
 %cmake_build
 
 
-
 %install
 %cmake_install
 
@@ -216,6 +219,7 @@ exit $ret
 %changelog
 * Fri Jul 24 2020 Remi Collet <remi@remirepo.net> - 1.17.0~rc0-2
 - use more cmake macros
+- add upstream patch for latest sphinx
 
 * Fri Jul 17 2020 Remi Collet <remi@remirepo.net> - 1.17.0~rc0-1
 - update to 1.17.0-rc0