From bc2f1908128763478ab12bdf4033c32f8b86391a Mon Sep 17 00:00:00 2001
From: Charalampos Stratakis <cstratak@redhat.com>
Date: Thu, 9 Apr 2020 15:19:18 +0200
Subject: [PATCH] Update to 1.15.39

Fix docutils 0.16 dependency issue
---
 fix-docutils-dependency.patch | 13 +++++++++++++
 python-botocore.spec          | 11 ++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 fix-docutils-dependency.patch

diff --git a/fix-docutils-dependency.patch b/fix-docutils-dependency.patch
new file mode 100644
index 0000000..9a39943
--- /dev/null
+++ b/fix-docutils-dependency.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index edc3578..555e5ef 100644
+--- a/setup.py
++++ b/setup.py
+@@ -25,7 +25,7 @@ def find_version(*file_paths):
+ 
+ requires = [
+     'jmespath>=0.7.1,<1.0.0',
+-    'docutils>=0.10,<0.16',
++    'docutils>=0.10,<1.0.0',
+     'python-dateutil>=2.1,<3.0.0',
+ ]
+ 
diff --git a/python-botocore.spec b/python-botocore.spec
index 0e01454..a5787b6 100644
--- a/python-botocore.spec
+++ b/python-botocore.spec
@@ -3,7 +3,7 @@
 Name:           python-%{pypi_name}
 # NOTICE - Updating this package requires updating python-boto3
 Version:        1.15.39
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Low-level, data-driven core of boto 3
 
 License:        ASL 2.0
@@ -11,6 +11,10 @@ URL:            https://github.com/boto/botocore
 Source0:        %{pypi_source}
 BuildArch:      noarch
 
+# Fix runtime dependency issue with docutils version 0.16
+# Upstream report: https://github.com/boto/botocore/issues/1942
+Patch0:         fix-docutils-dependency.patch
+
 %description
 A low-level interface to a growing number of Amazon Web Services. The
 botocore package is the foundation for the AWS CLI as well as boto3.
@@ -31,6 +35,8 @@ rm -vr %{pypi_name}.egg-info
 # Remove online tests
 rm -vr tests/integration
 
+%patch0 -p1
+
 # Temporary fix for Python 3.9, fix coming in https://github.com/boto/botocore/issues/2002
 find . -type f -name '*.py' | xargs sed -i s/cElementTree/ElementTree/g
 
@@ -47,6 +53,9 @@ find . -type f -name '*.py' | xargs sed -i s/cElementTree/ElementTree/g
 %{python3_sitelib}/%{pypi_name}-*.egg-info/
 
 %changelog
+* Thu Apr 09 2020 Charalampos Stratakis <cstratak@redhat.com> - 1.15.39-2
+- Fix docutils 0.16 runtime dependency issue
+
 * Thu Apr 09 2020 Gwyn Ciesla <gwync@protonmail.com> - 1.15.39-1
 - 1.15.39