[openstack-glance/el6-havana] reneable python-oslo-sphinx usage

[Pádraig Brady]

commit 7f3de35b094520b0670544eb6e78b17bd53df102
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Apr 10 16:21:22 2014 +0100

    reneable python-oslo-sphinx usage
    
    which is available on f20 and used by keystone also
    
    Conflicts:
    
    	openstack-glance.spec

 openstack-glance.spec |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/openstack-glance.spec b/openstack-glance.spec
index c1b9ff7..47f2a01 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -2,7 +2,7 @@
 
 Name:             openstack-glance
 Version:          2013.2.3
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          OpenStack Image Service
 
 Group:            Applications/System
@@ -30,7 +30,6 @@ 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-avoid-python-olso-sphinx-build-requirement.patch
 
 BuildArch:        noarch
 BuildRequires:    python2-devel
@@ -42,6 +41,7 @@ BuildRequires:    python-routes1.12
 BuildRequires:    python-sqlalchemy0.7
 BuildRequires:    python-webob1.2
 BuildRequires:    python-pbr
+BuildRequires:    python-oslo-sphinx
 
 Requires(post):   chkconfig
 Requires(preun):  initscripts
@@ -124,7 +124,7 @@ This package contains documentation files for glance.
 %patch0003 -p1
 %patch0004 -p1
 %patch0005 -p1
-%patch0006 -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
@@ -336,7 +336,7 @@ fi
 %doc doc/build/html
 
 %changelog
-* Thu Apr 10 2014 Pádraig Brady <pbrady at redhat.com> - 2013.2.3-1
+* Thu Apr 10 2014 Pádraig Brady <pbrady at redhat.com> - 2013.2.3-2
 - Update to Havana stable release 2013.2.3
 
 * Wed Feb 19 2014 Flavio Percoco <flavio at redhat.com> 2013.2.2-2