[openstack-heat/el6-havana] Rename patches with consistent numbering

[Jeff Peeler]

commit 329244f49902e6440af946d370b26b77814e869f
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Fri Nov 22 14:36:15 2013 -0500

    Rename patches with consistent numbering
    
    No functional changes
    Deleted unused bug1186389.patch

 ...to.patch => 0001-Switch-to-using-M2Crypto.patch |   16 +++---
 0002-remove-pbr-runtime-dependency.patch           |   30 +++++++++++
 ...s.patch => 0003-Fix-dependencies-for-EPEL.patch |    9 +++
 bug1186389.patch                                   |   56 --------------------
 openstack-heat.spec                                |   16 +++---
 remove-pbr-runtime-dependency.patch                |   21 -------
 6 files changed, 56 insertions(+), 92 deletions(-)
---
diff --git a/switch-to-using-m2crypto.patch b/0001-Switch-to-using-M2Crypto.patch
similarity index 85%
rename from switch-to-using-m2crypto.patch
rename to 0001-Switch-to-using-M2Crypto.patch
index 797894b..54f1d84 100644
--- a/switch-to-using-m2crypto.patch
+++ b/0001-Switch-to-using-M2Crypto.patch
@@ -1,14 +1,17 @@
-From 4510d7e7f427ac4b0770832108641a5048624332 Mon Sep 17 00:00:00 2001
+From d9a13dc6dd06fbfed6ddf63cba6aa9500123b6b9 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
 
 This patch uses M2Crypto instead of PyCrypto to perform encryption
 and decryption of user authentication information.
-
 ---
+ heat/common/crypt.py | 18 +++++++++++-------
+ requirements.txt     |  2 +-
+ 2 files changed, 12 insertions(+), 8 deletions(-)
+
 diff --git a/heat/common/crypt.py b/heat/common/crypt.py
-index 81b4c92..01fa353 100644
+index 81b4c92..2619b31 100644
 --- a/heat/common/crypt.py
 +++ b/heat/common/crypt.py
 @@ -14,7 +14,7 @@
@@ -48,8 +51,8 @@ index 81b4c92..01fa353 100644
 +                                 op=0) # 0 is decode
 +    res = cipher.update(auth[16:]) + cipher.final()
      return res
-diff --git a/tools/pip-requires b/tools/pip-requires
-index 06795f9..091168c 100644
+diff --git a/requirements.txt b/requirements.txt
+index 30400ea..4b2fc3f 100644
 --- a/requirements.txt
 +++ b/requirements.txt
 @@ -1,5 +1,5 @@
@@ -59,6 +62,3 @@ index 06795f9..091168c 100644
  eventlet>=0.13.0
  greenlet>=0.3.2
  httplib2
--- 
-1.8.1.4
-
diff --git a/0002-remove-pbr-runtime-dependency.patch b/0002-remove-pbr-runtime-dependency.patch
new file mode 100644
index 0000000..107c8b1
--- /dev/null
+++ b/0002-remove-pbr-runtime-dependency.patch
@@ -0,0 +1,30 @@
+From e94264510f1dd6aa2866233a826c112d2d787054 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
+
+---
+ heat/version.py | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/heat/version.py b/heat/version.py
+index a717606..8ea213a 100644
+--- a/heat/version.py
++++ b/heat/version.py
+@@ -14,6 +14,14 @@
+ #    under the License.
+ 
+ 
+-import pbr.version
++class VersionInfo(object):
++    release = 'REDHATHEATRELEASE'
++    version = 'REDHATHEATVERSION'
+ 
+-version_info = pbr.version.VersionInfo('heat')
++    def version_string(self):
++        return self.version
++
++    def release_string(self):
++        return self.release
++
++version_info = VersionInfo()
diff --git a/heat-newdeps.patch b/0003-Fix-dependencies-for-EPEL.patch
similarity index 84%
rename from heat-newdeps.patch
rename to 0003-Fix-dependencies-for-EPEL.patch
index b40a313..562de37 100644
--- a/heat-newdeps.patch
+++ b/0003-Fix-dependencies-for-EPEL.patch
@@ -1,3 +1,12 @@
+From 7fe99bd12f9989f7dbcf2da14ae7f85808be2d80 Mon Sep 17 00:00:00 2001
+From: Jeff Peeler <jpeeler at redhat.com>
+Date: Tue, 2 Apr 2013 18:08:48 -0400
+Subject: [PATCH] Fix dependencies for EPEL
+
+---
+ heat/common/__init__.py | 33 +++++++++++++++++++++++++++++++++
+ 1 file changed, 33 insertions(+)
+
 diff --git a/heat/common/__init__.py b/heat/common/__init__.py
 index e8e4035..0db8b7e 100644
 --- a/heat/common/__init__.py
diff --git a/openstack-heat.spec b/openstack-heat.spec
index cb50806..0c759c3 100644
--- a/openstack-heat.spec
+++ b/openstack-heat.spec
@@ -23,10 +23,12 @@ Source4:	openstack-heat-engine.init
 Source5:	openstack-heat-api-cloudwatch.init
 Source20:   heat-dist.conf
 
-Patch0: switch-to-using-m2crypto.patch
-Patch1: remove-pbr-runtime-dependency.patch
-# EPEL specific patch, not upstream
-Patch100: heat-newdeps.patch
+#
+# patches_base=2013.2
+#
+Patch0001: 0001-Switch-to-using-M2Crypto.patch
+Patch0002: 0002-remove-pbr-runtime-dependency.patch
+Patch0003: 0003-Fix-dependencies-for-EPEL.patch
 
 BuildArch: noarch
 BuildRequires: git
@@ -74,10 +76,10 @@ Requires: %{name}-api-cloudwatch = %{version}-%{release}
 
 %prep
 %setup -q -n %{full_release}
-%patch0 -p1
-%patch1 -p1
-%patch100 -p1
 
+%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
 sed -i s/REDHATHEATVERSION/%{version}/ heat/version.py
 sed -i s/REDHATHEATRELEASE/%{release}/ heat/version.py