From 3e4dd6aa912f8c3ca2634f8b964ab6c5f910ebe1371e6776228270897b73ec2c Mon Sep 17 00:00:00 2001
From: Jan Matejek <ja+suse@matejcik.cz>
Date: Fri, 23 Jun 2017 15:42:13 +0000
Subject: [PATCH] - drop upstreamed make_oslosphinx_optional.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=69
---
 make_oslosphinx_optional.patch | 37 ----------------------------------
 python-pbr-doc.changes         |  5 +++++
 python-pbr-doc.spec            |  3 ---
 3 files changed, 5 insertions(+), 40 deletions(-)
 delete mode 100644 make_oslosphinx_optional.patch

diff --git a/make_oslosphinx_optional.patch b/make_oslosphinx_optional.patch
deleted file mode 100644
index 3b49e75..0000000
--- a/make_oslosphinx_optional.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From ebd9ae850a18b26f37738a67b7e528896b249e40 Mon Sep 17 00:00:00 2001
-From: Thomas Bechtold <tbechtold@suse.com>
-Date: Thu, 9 Mar 2017 11:29:48 +0100
-Subject: [PATCH] Make oslosphinx optional
-
-Avoid cyclic dependencies between pbr and oslosphinx. So if oslosphinx is not
-available, continue to be able to generate the documentation.
-
-Change-Id: I4c1f8ea5cded268388dab29931055223f8999c8a
----
- doc/source/conf.py | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 31003c1..f0a78ec 100644
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -8,8 +8,14 @@ sys.path.insert(0, os.path.abspath('../..'))
- 
- # Add any Sphinx extension module names here, as strings. They can be
- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.autodoc',
--              'oslosphinx']
-+extensions = ['sphinx.ext.autodoc']
-+# make oslosphinx optional to not increase the needed dependencies
-+try:
-+    import oslosphinx
-+except ImportError:
-+    pass
-+else:
-+    extensions.append('oslosphinx')
- 
- # autodoc generation is a bit aggressive and a nuisance when doing heavy
- # text edit cycles.
--- 
-1.9.1
-
diff --git a/python-pbr-doc.changes b/python-pbr-doc.changes
index 97818e7..d57d5f5 100644
--- a/python-pbr-doc.changes
+++ b/python-pbr-doc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 23 15:21:37 UTC 2017 - jmatejek@suse.com
+
+- drop upstreamed make_oslosphinx_optional.patch
+
 -------------------------------------------------------------------
 Wed Mar 29 11:59:55 UTC 2017 - tbechtold@suse.com
 
diff --git a/python-pbr-doc.spec b/python-pbr-doc.spec
index 66e95e1..f7ffe6b 100644
--- a/python-pbr-doc.spec
+++ b/python-pbr-doc.spec
@@ -26,8 +26,6 @@ Group:          Development/Languages/Python
 Url:            http://pypi.python.org/pypi/pbr
 Source:         https://files.pythonhosted.org/packages/source/p/pbr/pbr-%{version}.tar.gz
 Source1:        python-pbr-rpmlintrc
-# make_oslosphinx_optional.patch - https://review.openstack.org/#/c/443555/
-Patch1:         make_oslosphinx_optional.patch
 BuildRequires:  fdupes
 # Documentation requirements:
 BuildRequires:  python3-Sphinx >= 1.1.2
@@ -41,7 +39,6 @@ This package contains documentation files for python-pbr
 
 %prep
 %setup -q -n pbr-%{version}
-%patch1 -p1
 # Get rid of ugly build-time deps that require network:
 sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py