[openstack-heat/el6-icehouse] Rebase to 2014.1.1

[Jeff Peeler]

commit 9fc438cbe9d9285da03bb1a6b508bd32af3d703b
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Tue Jun 10 17:31:58 2014 -0400

    Rebase to 2014.1.1

 openstack-heat.spec |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/openstack-heat.spec b/openstack-heat.spec
index f073e46..dc75fb8 100644
--- a/openstack-heat.spec
+++ b/openstack-heat.spec
@@ -7,8 +7,8 @@
 
 Name:		openstack-heat
 Summary:	OpenStack Orchestration (heat)
-Version:	2014.1
-Release:	1.1%{?dist}
+Version:	2014.1.1
+Release:	2.0%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		http://www.openstack.org
@@ -24,7 +24,7 @@ Source5:	openstack-heat-api-cloudwatch.init
 Source20:   heat-dist.conf
 
 #
-# patches_base=2014.1
+# patches_base=2014.1.1
 #
 Patch0001: 0001-Switch-to-using-M2Crypto.patch
 Patch0002: 0002-remove-pbr-runtime-dependency.patch
@@ -84,6 +84,9 @@ Requires: %{name}-api-cloudwatch = %{version}-%{release}
 sed -i s/REDHATHEATVERSION/%{version}/ heat/version.py
 sed -i s/REDHATHEATRELEASE/%{release}/ heat/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 requires_dist config
 rm -rf {test-,}requirements.txt tools/{pip,test}-requires
@@ -387,6 +390,10 @@ fi
 
 
 %changelog
+* Tue Jun 10 2014 Jeff Peeler <jpeeler at redhat.com> - 2014.1.1-2.0
+- updated to 2014.1.1
+- removed patch to build against python-oslo-sphinx and put change in spec
+
 * Mon May  5 2014 Jeff Peeler <jpeeler at redhat.com> - 2014.1-1.1
 - Drop parallel packages