[python-heatclient/f21] Update to upstream 0.2.11

[Ryan Brown]

commit 19f33f4a656ed6431c812a248da1cf8607767c1a
Author: Ryan S. Brown <rybrown at redhat.com>
Date:   Mon Sep 22 16:54:16 2014 -0400

    Update to upstream 0.2.11
    
    Add git and python-oslo-sphinx

 .gitignore                                         |    1 +
 0001-Nuke-pbr-requirements-handling.patch          |    2 +-
 0002-Remove-runtime-dependency-on-python-pbr.patch |    2 +-
 ...-patch-import-name-for-python-oslo-sphinx.patch |   22 ++++++++++++++++++++
 python-heatclient.spec                             |   12 +++++++++-
 sources                                            |    2 +-
 6 files changed, 36 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7dbf478..b410a5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /python-heatclient-0.2.6.tar.gz
 /python-heatclient-0.2.9.tar.gz
 /python-heatclient-0.2.10.tar.gz
+/python-heatclient-0.2.11.tar.gz
diff --git a/0001-Nuke-pbr-requirements-handling.patch b/0001-Nuke-pbr-requirements-handling.patch
index acddc99..a3bfb5d 100644
--- a/0001-Nuke-pbr-requirements-handling.patch
+++ b/0001-Nuke-pbr-requirements-handling.patch
@@ -1,4 +1,4 @@
-From ae08c707fd64193dca4c830dfe0b0cf6adf65462 Mon Sep 17 00:00:00 2001
+From 7aee1035eb58611b5075bf6a65e3ca5c2e0748b4 Mon Sep 17 00:00:00 2001
 From: Jakub Ruzicka <jruzicka at redhat.com>
 Date: Mon, 16 Sep 2013 17:25:48 +0200
 Subject: [PATCH] Nuke pbr requirements handling
diff --git a/0002-Remove-runtime-dependency-on-python-pbr.patch b/0002-Remove-runtime-dependency-on-python-pbr.patch
index 4bafef7..37a13ca 100644
--- a/0002-Remove-runtime-dependency-on-python-pbr.patch
+++ b/0002-Remove-runtime-dependency-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 2e1302dd388df3378e28529a302a344d2efaf6b7 Mon Sep 17 00:00:00 2001
+From b50df871ae1711a82153368272f256381b8b3fda Mon Sep 17 00:00:00 2001
 From: Jakub Ruzicka <jruzicka at redhat.com>
 Date: Mon, 9 Dec 2013 15:58:31 +0100
 Subject: [PATCH] Remove runtime dependency on python-pbr
diff --git a/0003-patch-import-name-for-python-oslo-sphinx.patch b/0003-patch-import-name-for-python-oslo-sphinx.patch
new file mode 100644
index 0000000..c1b1783
--- /dev/null
+++ b/0003-patch-import-name-for-python-oslo-sphinx.patch
@@ -0,0 +1,22 @@
+From 1475f5a503d66fd89f45afc8a8dfee9b70710053 Mon Sep 17 00:00:00 2001
+From: "Ryan S. Brown" <rybrown at redhat.com>
+Date: Mon, 22 Sep 2014 14:46:15 -0400
+Subject: [PATCH] patch import name for python-oslo-sphinx
+
+---
+ doc/source/conf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index e611dbe..a5ec78f 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -36,7 +36,7 @@ exec(open(os.path.join("ext", "gen_ref.py")).read())
+ # 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', 'oslo.sphinx']
+ 
+ # Add any paths that contain templates here, relative to this directory.
+ if os.getenv('HUDSON_PUBLISH_DOCS'):
diff --git a/python-heatclient.spec b/python-heatclient.spec
index 9726cc4..d608996 100644
--- a/python-heatclient.spec
+++ b/python-heatclient.spec
@@ -1,5 +1,5 @@
 Name:    python-heatclient
-Version: 0.2.10
+Version: 0.2.11
 Release: 1%{?dist}
 Summary: Python API and CLI for OpenStack Heat
 
@@ -9,10 +9,11 @@ URL:     http://pypi.python.org/pypi/python-heatclient
 Source0: http://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
 
 #
-# patches_base=0.2.10
+# patches_base=0.2.11
 #
 Patch0001: 0001-Nuke-pbr-requirements-handling.patch
 Patch0002: 0002-Remove-runtime-dependency-on-python-pbr.patch
+Patch0003: 0003-patch-import-name-for-python-oslo-sphinx.patch
 
 BuildArch: noarch
 
@@ -39,6 +40,8 @@ Summary: Documentation for OpenStack Heat API Client
 Group:   Documentation
 
 BuildRequires: python-sphinx
+BuildRequires: python-oslo-sphinx
+BuildRequires: git
 
 %description doc
 This is a client for the OpenStack Heat API. There's a Python API (the
@@ -52,6 +55,7 @@ This package contains auto-generated documentation.
 
 %patch0001 -p1
 %patch0002 -p1
+%patch0003 -p1
 
 # We provide version like this in order to remove runtime dep on pbr.
 sed -i s/REDHATHEATCLIENTVERSION/%{version}/ heatclient/__init__.py
@@ -91,6 +95,10 @@ rm -fr html/.doctrees html/.buildinfo
 %doc html
 
 %changelog
+* Mon Sep 22 2014 Ryan Brown <rybrown at redhat.com> - 0.2.11-1
+- Bump to new (0.2.11) client release
+- Add BuildRequires for git and python-oslo-sphinx
+
 * Thu Sep 18 2014 Ryan Brown <rybrown at redhat.com> - 0.2.10-1
 - Bump to new (0.2.10) client release
 - Include bash completion file (rhbz #1140842)
diff --git a/sources b/sources
index 6fe9f7d..eb0cd3c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f451ca000e4e2e739aeb351cccd2789d  python-heatclient-0.2.10.tar.gz
+1f707145911fab0f6621ec62e204190d  python-heatclient-0.2.11.tar.gz