[python-heatclient/f21] Update to 0.2.12

[Ryan Brown]

commit 0f78174c02d79f63174b58ddf9e7cf517b277d96
Author: Ryan S. Brown <rybrown at redhat.com>
Date:   Fri Sep 26 09:29:26 2014 -0400

    Update to 0.2.12

 .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                             |   14 +++++++++---
 sources                                            |    2 +-
 6 files changed, 14 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b410a5b..5fe79ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /python-heatclient-0.2.9.tar.gz
 /python-heatclient-0.2.10.tar.gz
 /python-heatclient-0.2.11.tar.gz
+/python-heatclient-0.2.12.tar.gz
diff --git a/0001-Nuke-pbr-requirements-handling.patch b/0001-Nuke-pbr-requirements-handling.patch
index a3bfb5d..296e950 100644
--- a/0001-Nuke-pbr-requirements-handling.patch
+++ b/0001-Nuke-pbr-requirements-handling.patch
@@ -1,4 +1,4 @@
-From 7aee1035eb58611b5075bf6a65e3ca5c2e0748b4 Mon Sep 17 00:00:00 2001
+From 4bc6bf468d560df13b2586087ef3c93a73d7db98 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 37a13ca..0ba0329 100644
--- a/0002-Remove-runtime-dependency-on-python-pbr.patch
+++ b/0002-Remove-runtime-dependency-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From b50df871ae1711a82153368272f256381b8b3fda Mon Sep 17 00:00:00 2001
+From 99d7f3a7f56cc8839b9e2774f13bfca538a36035 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/python-heatclient.spec b/python-heatclient.spec
index d608996..fbcea9f 100644
--- a/python-heatclient.spec
+++ b/python-heatclient.spec
@@ -1,5 +1,5 @@
 Name:    python-heatclient
-Version: 0.2.11
+Version: 0.2.12
 Release: 1%{?dist}
 Summary: Python API and CLI for OpenStack Heat
 
@@ -9,11 +9,10 @@ URL:     http://pypi.python.org/pypi/python-heatclient
 Source0: http://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
 
 #
-# patches_base=0.2.11
+# patches_base=0.2.12
 #
 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
 
@@ -55,11 +54,14 @@ 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
 
+# Until Oslo's new namespace (oslosphinx) propagates into yum packages we need                │  4 * Thu Sep 18 2014 Ryan Brown <rybrown at redhat.com> - 0.2.10-1$
+# to fix its import name                                                                      │  5 - Bump to new (0.2.10) client release$
+sed -i s/oslosphinx/oslo.sphinx/ doc/source/conf.py
+
 # Remove the requirements file so that pbr hooks don't add it
 # to distutils requires_dist config.
 rm -rf {test-,}requirements.txt tools/{pip,test}-requires
@@ -95,6 +97,10 @@ rm -fr html/.doctrees html/.buildinfo
 %doc html
 
 %changelog
+* Thu Sep 26 2014 Ryan Brown <rybrown at redhat.com> - 0.2.12-1
+- Bump to 0.2.12 client release
+- Remove patch and use sed in %prep to fix oslosphinx import instead
+
 * 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
diff --git a/sources b/sources
index eb0cd3c..d637fad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1f707145911fab0f6621ec62e204190d  python-heatclient-0.2.11.tar.gz
+e05a3a2dfe6ced38c5bdc13e00c83a7b  python-heatclient-0.2.12.tar.gz