[openstack-heat] Updated patches from master-patches

[Jeff Peeler]

commit 16ca27b28906950ef78e110257c2906fd1c50e27
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Tue Jun 10 17:35:56 2014 -0400

    Updated patches from master-patches
    
    Removed Patch-to-allow-building-against-python-oslo-sphinx.patch
    Is now handled directly in the spec file.

 0001-Switch-to-using-M2Crypto.patch                |    4 +-
 0002-remove-pbr-runtime-dependency.patch           |    2 +-
 ...allow-building-against-python-oslo-sphinx.patch |   26 --------------------
 openstack-heat.spec                                |    2 -
 4 files changed, 3 insertions(+), 31 deletions(-)
---
diff --git a/0001-Switch-to-using-M2Crypto.patch b/0001-Switch-to-using-M2Crypto.patch
index 645ec2d..ced3d7b 100644
--- a/0001-Switch-to-using-M2Crypto.patch
+++ b/0001-Switch-to-using-M2Crypto.patch
@@ -1,4 +1,4 @@
-From a400f4cca14b027a02656337a34c2a3fc92707a8 Mon Sep 17 00:00:00 2001
+From d4ad0053b873a488efc508cb11586c0aaf90dc66 Mon Sep 17 00:00:00 2001
 From: Jeff Peeler <jpeeler at redhat.com>
 Date: Wed, 8 May 2013 12:27:35 -0400
 Subject: [PATCH] Switch to using M2Crypto
@@ -68,7 +68,7 @@ index c87678f..b3fdd45 100644
 +    res = cipher.update(auth[16:]) + cipher.final()
      return res
 diff --git a/requirements.txt b/requirements.txt
-index d93023a..1acfb9b 100644
+index 4b6298d..ae9e85f 100644
 --- a/requirements.txt
 +++ b/requirements.txt
 @@ -1,5 +1,6 @@
diff --git a/0002-remove-pbr-runtime-dependency.patch b/0002-remove-pbr-runtime-dependency.patch
index 43c5a31..fca2b37 100644
--- a/0002-remove-pbr-runtime-dependency.patch
+++ b/0002-remove-pbr-runtime-dependency.patch
@@ -1,4 +1,4 @@
-From 9f2026d4d44c4e82dfcb44963f045f55a8422525 Mon Sep 17 00:00:00 2001
+From a60c0a4e05e5687e7c2dc590c309c58e616160c4 Mon Sep 17 00:00:00 2001
 From: Jeff Peeler <jpeeler at redhat.com>
 Date: Mon, 14 Oct 2013 14:30:34 -0400
 Subject: [PATCH] remove pbr runtime dependency
diff --git a/openstack-heat.spec b/openstack-heat.spec
index b193e83..57df44b 100644
--- a/openstack-heat.spec
+++ b/openstack-heat.spec
@@ -28,7 +28,6 @@ Source20:   heat-dist.conf
 #
 Patch0001: 0001-Switch-to-using-M2Crypto.patch
 Patch0002: 0002-remove-pbr-runtime-dependency.patch
-Patch0003: 0003-Patch-to-allow-building-against-python-oslo-sphinx.patch
 
 BuildArch: noarch
 BuildRequires: git
@@ -80,7 +79,6 @@ Requires: %{name}-api-cloudwatch = %{version}-%{release}
 
 %patch0001 -p1
 %patch0002 -p1
-%patch0003 -p1
 sed -i s/REDHATHEATVERSION/%{version}/ heat/version.py
 sed -i s/REDHATHEATRELEASE/%{release}/ heat/version.py