[openstack-heat/el6-icehouse] Updated patches from el6-icehouse-patches

[Jeff Peeler]

commit 8435580769c2b334005ec977947b7fbf8221bc58
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Mon May 5 17:09:01 2014 -0400

    Updated patches from el6-icehouse-patches
    
    (dropped 0003-Adjust-to-handle-parallel-installed-packages.patch)

 ...ust-to-handle-parallel-installed-packages.patch |   50 --------------------
 ...allow-building-against-python-oslo-sphinx.patch |    2 +-
 openstack-heat.spec                                |    4 +-
 3 files changed, 3 insertions(+), 53 deletions(-)
---
diff --git a/0004-Patch-to-allow-building-against-python-oslo-sphinx.patch b/0003-Patch-to-allow-building-against-python-oslo-sphinx.patch
similarity index 92%
rename from 0004-Patch-to-allow-building-against-python-oslo-sphinx.patch
rename to 0003-Patch-to-allow-building-against-python-oslo-sphinx.patch
index 416c51f..54dc2e4 100644
--- a/0004-Patch-to-allow-building-against-python-oslo-sphinx.patch
+++ b/0003-Patch-to-allow-building-against-python-oslo-sphinx.patch
@@ -1,4 +1,4 @@
-From 1d45ac69d4a3c69c0740f6dc151e1a1c82c687f7 Mon Sep 17 00:00:00 2001
+From b7274ea3cf7d6538a00f9fa335fd927b62d983fe Mon Sep 17 00:00:00 2001
 From: Jeff Peeler <jpeeler at redhat.com>
 Date: Fri, 7 Mar 2014 11:50:58 -0500
 Subject: [PATCH] Patch to allow building against python-oslo-sphinx
diff --git a/openstack-heat.spec b/openstack-heat.spec
index 161e709..f073e46 100644
--- a/openstack-heat.spec
+++ b/openstack-heat.spec
@@ -28,7 +28,7 @@ Source20:   heat-dist.conf
 #
 Patch0001: 0001-Switch-to-using-M2Crypto.patch
 Patch0002: 0002-remove-pbr-runtime-dependency.patch
-Patch0004: 0004-Patch-to-allow-building-against-python-oslo-sphinx.patch
+Patch0003: 0003-Patch-to-allow-building-against-python-oslo-sphinx.patch
 
 BuildArch: noarch
 BuildRequires: git
@@ -80,7 +80,7 @@ Requires: %{name}-api-cloudwatch = %{version}-%{release}
 
 %patch0001 -p1
 %patch0002 -p1
-%patch0004 -p1
+%patch0003 -p1
 sed -i s/REDHATHEATVERSION/%{version}/ heat/version.py
 sed -i s/REDHATHEATRELEASE/%{release}/ heat/version.py