[openstack-glance/f20] update to Havana stable release 2013.2.3

[Pádraig Brady]

commit fde2436420b77df597e5945c5052b7888d4fd5a6
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Apr 10 13:25:58 2014 +0100

    update to Havana stable release 2013.2.3

 .gitignore                                         |    1 +
 0001-Remove-runtime-dep-on-python-pbr.patch        |    6 ++--
 ...-Don-t-access-the-net-while-building-docs.patch |   10 +++---
 ...-oslo.sphinx-and-remove-local-copy-of-doc.patch |   33 --------------------
 openstack-glance.spec                              |   14 +++++---
 sources                                            |    2 +-
 6 files changed, 19 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5f9415c..0c6b1ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /glance-2013.2.tar.gz
 /glance-2013.2.1.tar.gz
 /glance-2013.2.2.tar.gz
+/glance-2013.2.3.tar.gz
diff --git a/0001-Remove-runtime-dep-on-python-pbr.patch b/0001-Remove-runtime-dep-on-python-pbr.patch
index 56ecef6..669484e 100644
--- a/0001-Remove-runtime-dep-on-python-pbr.patch
+++ b/0001-Remove-runtime-dep-on-python-pbr.patch
@@ -1,11 +1,11 @@
-From d6493b446a0d883582dfcb51e07065e447046e38 Mon Sep 17 00:00:00 2001
+From 5394eccec74da85a12f5c08e4900327d4f650b15 Mon Sep 17 00:00:00 2001
 From: John Bresnahan <jbresnah at redhat.com>
 Date: Wed, 18 Sep 2013 16:43:45 -1000
 Subject: [PATCH] Remove runtime dep on python pbr
 
 ---
- glance/version.py | 29 +++++++++++++++++++++++++++--
- 1 file changed, 27 insertions(+), 2 deletions(-)
+ glance/version.py |   29 +++++++++++++++++++++++++++--
+ 1 files changed, 27 insertions(+), 2 deletions(-)
 
 diff --git a/glance/version.py b/glance/version.py
 index d815183..9e20ed0 100644
diff --git a/0003-Don-t-access-the-net-while-building-docs.patch b/0002-Don-t-access-the-net-while-building-docs.patch
similarity index 78%
rename from 0003-Don-t-access-the-net-while-building-docs.patch
rename to 0002-Don-t-access-the-net-while-building-docs.patch
index 13c6aa7..bead6f1 100644
--- a/0003-Don-t-access-the-net-while-building-docs.patch
+++ b/0002-Don-t-access-the-net-while-building-docs.patch
@@ -1,4 +1,4 @@
-From 23c18497914a484b9eba007bc8d58e704d34f1d4 Mon Sep 17 00:00:00 2001
+From af6c31bf33594c369640931f5905f7a2ac8a86ff Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
 Date: Fri, 6 Jan 2012 17:12:54 +0000
 Subject: [PATCH] Don't access the net while building docs
@@ -8,11 +8,11 @@ Subject: [PATCH] Don't access the net while building docs
 Change-Id: I42c6e3a5062db209a0abe00cebc04d383c79cbcb
 (cherry picked from commit f2b4bb4e45afcc178200966193a7b87401c534d7)
 ---
- doc/source/conf.py | 1 -
- 1 file changed, 1 deletion(-)
+ doc/source/conf.py |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
-index b8d2ac8..d1eb08e 100644
+index 04f4ebe..8ceeb43 100644
 --- a/doc/source/conf.py
 +++ b/doc/source/conf.py
 @@ -44,7 +44,6 @@ sys.path = [
@@ -22,4 +22,4 @@ index b8d2ac8..d1eb08e 100644
 -              'sphinx.ext.intersphinx',
                'sphinx.ext.pngmath',
                'sphinx.ext.graphviz',
-               ]
+               'oslo.sphinx',
diff --git a/openstack-glance.spec b/openstack-glance.spec
index d18ff46..14486bc 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,5 +1,5 @@
 Name:             openstack-glance
-Version:          2013.2.2
+Version:          2013.2.3
 Release:          1%{?dist}
 Summary:          OpenStack Image Service
 
@@ -18,11 +18,10 @@ Source7:          glance-cache-dist.conf
 Source8:          glance-scrubber-dist.conf
 
 #
-# patches_base=2013.2.2
+# patches_base=2013.2.3
 #
 Patch0001: 0001-Remove-runtime-dep-on-python-pbr.patch
-Patch0002: 0002-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
-Patch0003: 0003-Don-t-access-the-net-while-building-docs.patch
+Patch0002: 0002-Don-t-access-the-net-while-building-docs.patch
 
 BuildArch:        noarch
 BuildRequires:    python2-devel
@@ -112,7 +111,6 @@ This package contains documentation files for glance.
 
 %patch0001 -p1
 %patch0002 -p1
-%patch0003 -p1
 # Remove bundled egg-info
 rm -rf glance.egg-info
 sed -i '/\/usr\/bin\/env python/d' glance/common/config.py glance/common/crypt.py glance/db/sqlalchemy/migrate_repo/manage.py
@@ -123,6 +121,9 @@ sed -i '/setuptools_git/d; /setup_requires/d; /install_requires/d; /dependency_l
 sed -i s/REDHATGLANCEVERSION/%{version}/ glance/version.py
 sed -i s/REDHATGLANCERELEASE/%{release}/ glance/version.py
 
+# make doc build compatible with python-oslo-sphinx RPM
+sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
+
 # Remove the requirements file so that pbr hooks don't add it
 # to distutils requiers_dist config
 rm -rf {test-,}requirements.txt tools/{pip,test}-requires
@@ -318,6 +319,9 @@ fi
 %doc doc/build/html
 
 %changelog
+* Thu Apr 10 2014 Pádraig Brady <pbrady at redhat.com> - 2013.2.3-1
+- Update to Havana stable release 2013.2.3
+
 * Fri Feb 14 2014 Flavio Percoco <flavio at redhat.com> 2013.2.2-1
 - Update to Havana stable release 2013.2.2
 
diff --git a/sources b/sources
index 9d90e02..2622038 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5df9916fd7feb72daec249fc0b6778d9  glance-2013.2.2.tar.gz
+385aea03a638948cba4a068fe8fa0eca  glance-2013.2.3.tar.gz