[openstack-heat/el6-havana] Rebase to havana-2

[Jeff Peeler]

commit f79c1d253355b2556689edf837a50511c1cae10d
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Mon Jul 22 11:14:20 2013 -0400

    Rebase to havana-2

 .gitignore                     |    1 +
 openstack-heat.spec            |    8 ++++----
 sources                        |    2 +-
 switch-to-using-m2crypto.patch |    7 +++----
 4 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f78ee93..8890a39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /heat-2013.1.rc2.tar.gz
 /heat-2013.1.tar.gz
 /heat-2013.2.b1.tar.gz
+/heat-2013.2.b2.tar.gz
diff --git a/openstack-heat.spec b/openstack-heat.spec
index 870c76d..6417af1 100644
--- a/openstack-heat.spec
+++ b/openstack-heat.spec
@@ -1,6 +1,6 @@
 %global release_name havana
 %global release_letter b
-%global milestone 1
+%global milestone 2
 %global full_release heat-%{version}.%{release_letter}%{milestone}
 
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
@@ -24,8 +24,6 @@ Source5:	openstack-heat-api-cloudwatch.init
 
 
 Patch0: switch-to-using-m2crypto.patch
-# bug fix already committed upstream, fixes autoscaling
-Patch1: bug1186389.patch
 # EPEL specific patch, not upstream
 Patch100: heat-newdeps.patch
 
@@ -51,7 +49,6 @@ Requires: %{name}-cli = %{version}-%{release}
 %prep
 %setup -q -n %{full_release}
 %patch0 -p1
-%patch1 -p1
 %patch100 -p1
 
 %build
@@ -322,6 +319,9 @@ Heat client tools accessible from the CLI
 %{_mandir}/man1/heat-watch.1.gz
 
 %changelog
+* Mon Jul 22 2013 Jeff Peeler <jpeeler at redhat.com> 2013.2-0.2.b2
+- rebase to havana-2
+
 * Mon Jun 10 2013 Jeff Peeler <jpeeler at redhat.com> 2013.2-0.2.b1
 - fix m2crypto patch
 
diff --git a/sources b/sources
index 2cc7b68..64bef0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a9a114f5f7878dbdfbfab0cf16d4cd3c  heat-2013.2.b1.tar.gz
+a329ebac510437b974703c964571d6f8  heat-2013.2.b2.tar.gz
diff --git a/switch-to-using-m2crypto.patch b/switch-to-using-m2crypto.patch
index 535c567..7b24618 100644
--- a/switch-to-using-m2crypto.patch
+++ b/switch-to-using-m2crypto.patch
@@ -52,10 +52,9 @@ diff --git a/tools/pip-requires b/tools/pip-requires
 index 06795f9..091168c 100644
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -12,7 +12,7 @@
- # installed using pip, therefore you will need to install the
- # libxml2-dev(el) and libxslt-dev(el) packages.
- 
+@@ -1,6 +1,6 @@
+ d2to1>=0.2.10,<0.3
+ pbr>=0.5.10,<0.6
 -PyCrypto>=2.1.0
 +M2Crypto
  boto>=2.4.0