[openstack-glance/el6-havana] Revert use oslo.sphinx and remove local copy of doc

[John Bresnahan]

commit f1673aeb788768fad27bbd4f2a99c0094414b879
Author: John Bresnahan <jbresnah at redhat.com>
Date:   Mon Sep 9 16:34:18 2013 -1000

    Revert use oslo.sphinx and remove local copy of doc

 ...-oslo.sphinx-and-remove-local-copy-of-doc.patch |   33 ++++++++++++++++++++
 openstack-glance.spec                              |    7 ++--
 2 files changed, 37 insertions(+), 3 deletions(-)
---
diff --git a/0006-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch b/0006-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
new file mode 100644
index 0000000..a8ecfd4
--- /dev/null
+++ b/0006-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
@@ -0,0 +1,33 @@
+From 9d455a5c604a7cac6317d7ffc9f232414eb2542c Mon Sep 17 00:00:00 2001
+From: John Bresnahan <jbresnah at redhat.com>
+Date: Mon, 9 Sep 2013 16:33:41 -1000
+Subject: [PATCH] Revert use oslo.sphinx and remove local copy of doc
+
+---
+ doc/source/conf.py    | 1 -
+ test-requirements.txt | 3 ---
+ 2 files changed, 4 deletions(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index 8ceeb43..d1eb08e 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -46,7 +46,6 @@ extensions = ['sphinx.ext.coverage',
+               'sphinx.ext.ifconfig',
+               'sphinx.ext.pngmath',
+               'sphinx.ext.graphviz',
+-              'oslo.sphinx',
+               ]
+ 
+ # Add any paths that contain templates here, relative to this directory.
+diff --git a/test-requirements.txt b/test-requirements.txt
+index 2273169..751363d 100644
+--- a/test-requirements.txt
++++ b/test-requirements.txt
+@@ -27,6 +27,3 @@ psycopg2
+ pysendfile==2.0.0
+ qpid-python
+ xattr>=0.4
+-
+-# Documentation
+-oslo.sphinx
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 66e5698..83ca59f 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -23,6 +23,7 @@ Patch0002: 0002-Use-updated-parallel-install-versions-of-epel-packag.patch
 Patch0003: 0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
 Patch0004: 0004-Avoid-NULLs-in-crypto-padding.patch
 Patch0005: 0005-Remove-runtime-dep-on-python-pbr.patch
+Patch0006: 0006-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
 
 BuildArch:        noarch
 BuildRequires:    python2-devel
@@ -115,6 +116,7 @@ sed -i 's/%{version}.b3/%{version}/' PKG-INFO
 %patch0003 -p1
 %patch0004 -p1
 %patch0005 -p1
+%patch0006 -p1
 
 
 # Remove bundled egg-info
@@ -309,10 +311,9 @@ fi
 
 %changelog
 * Mon Sep  9 2013 John Bresnahan <jbresnah at redhat.com> 2013.2.b3
-- Remove runtime dep on python pbr
-
-* Mon Sep  9 2013 John Bresnahan <jbresnah at redhat.com> 2013.2.b3
 - Update to 2013.2.b3
+- Remove runtime dep on python pbr
+- Revert use oslo.sphinx and remove local copy of doc
 
 * Tue Jul 23 2013 John Bresnahan <jbresnah at redhat.com> 2013.2-0.6.b2
 - Do not log DEBUG by default