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

[John Bresnahan]

commit e93bd443e4850b1b379f5acb28f7792069e239c4
Author: John Bresnahan <jbresnah at redhat.com>
Date:   Mon Sep 9 17:02:20 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                              |    6 +++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/0003-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch b/0003-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
new file mode 100644
index 0000000..5ddbd33
--- /dev/null
+++ b/0003-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
@@ -0,0 +1,33 @@
+From 46b08c8e6083ca43cae989fa47bdaf3489c6f3c7 Mon Sep 17 00:00:00 2001
+From: John Bresnahan <jbresnah at redhat.com>
+Date: Mon, 9 Sep 2013 17:02:07 -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 db946a4..b5448f5 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -6,7 +6,7 @@ Summary:          OpenStack Image Service
 Group:            Applications/System
 License:          ASL 2.0
 URL:              http://glance.openstack.org
-Source0:          https://launchpad.net/glance/havana/havana-2/+download/glance-2013.2.b2.tar.gz
+Source0:          https://launchpad.net/glance/havana/havana-3/+download/glance-2013.2.b3.tar.gz
 Source1:          openstack-glance-api.service
 Source2:          openstack-glance-registry.service
 Source3:          openstack-glance-scrubber.service
@@ -17,6 +17,7 @@ Source4:          openstack-glance.logrotate
 #
 Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
 Patch0002: 0002-Remove-runtime-dep-on-python-pbr.patch
+Patch0003: 0003-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
 
 BuildArch:        noarch
 BuildRequires:    python2-devel
@@ -31,6 +32,7 @@ Requires:         python-glance = %{version}-%{release}
 Requires:         python-glanceclient >= 1:0
 Requires:         openstack-utils
 BuildRequires:    openstack-utils
+BuildRequires:    python-pbr
 
 %description
 OpenStack Image Service (code-named Glance) provides discovery, registration,
@@ -104,6 +106,7 @@ This package contains documentation files for glance.
 sed -i 's/%{version}.b3/%{version}/' PKG-INFO
 %patch0001 -p1
 %patch0002 -p1
+%patch0003 -p1
 
 # Remove bundled egg-info
 rm -rf glance.egg-info
@@ -284,6 +287,7 @@ fi
 * Mon Sep  9 2013 John Bresnahan <jbresnah at redhat.com> 2013.2-0.8.b3
 - Update to version 2013.2.b3
 - Remove runtime dep on python pbr
+- Revert use oslo.sphinx and remove local copy of doc
 
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2013.2-0.7.b2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild