Adjust "kombu" version in requirements.txt

 Set the lower bound - "kombu>=2.5.0" according to
 https://github.com/openstack/requirements/blob/stable/juno/global-requirements.txt#L43

 Related-bug:#1434093

Change-Id: I73e1e7bdeae2f2e23d39dba5eaad50a02d75c75c

diff --git a/rpm/SOURCES/0003-Adjust-kombu-version-in-requirements.txt.patch b/rpm/SOURCES/0003-Adjust-kombu-version-in-requirements.txt.patch
new file mode 100644 (file)
index 0000000..71c1ae7
--- /dev/null
+++ b/rpm/SOURCES/0003-Adjust-kombu-version-in-requirements.txt.patch
@@ -0,0 +1,26 @@
+Author: iberezovskiy <iberezovskiy@mirantis.com>
+Date:   Fri Mar 20 14:57:00 2015 +0300
+Subject: [PATCH] Adjust-kombu-version-in-requirements.txt
+
+ Adjust "kombu" version in requirements.txt:
+ set the lower bound - "kombu>=2.5.0" according to
+ https://github.com/openstack/requirements/blob/stable/juno/global-requirements.txt#L43
+ Related-bug:#1434093
+
+---
+ requirements.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index 16e102b..def5c6d 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -10,7 +10,7 @@ greenlet>=0.3.2,<=0.4.2
+ httplib2>=0.7.5,<=0.9
+ iso8601>=0.1.9,<=0.1.10
+ keystonemiddleware>=1.0.0,<1.4.0
+-kombu>=2.5.0,<=3.0.7
++kombu>=2.5.0
+ lxml>=2.3,<=3.3.3
+ netaddr>=0.7.12,<=0.7.13
+ oslo.config>=1.4.0,<=1.6.0 # Apache-2.0

diff --git a/rpm/SPECS/openstack-heat.spec b/rpm/SPECS/openstack-heat.spec
index 61436a6fa4d623ed3a910042e49a64779c34fecc..8f040434bbc8fe51524022fda106c021da65a812 100644 (file)
--- a/rpm/SPECS/openstack-heat.spec
+++ b/rpm/SPECS/openstack-heat.spec
@@ -28,6 +28,7 @@ Source5:      openstack-heat-api-cloudwatch.init
 
 Patch0001: 0001-remove-pbr-runtime-dependency.patch
 Patch0002: 0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch
+Patch0003: 0003-Adjust-kombu-version-in-requirements.txt.patch
 
 BuildArch: noarch
 BuildRequires: git
@@ -89,6 +90,7 @@ 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
 
@@ -424,6 +426,9 @@ fi
 
 
 %changelog
+* Fri Mar 20 2015 Ivan Berezovskiy <iberezovskiy@mirantis.com> - 2014.2.2
+- Add patch to fix kombu version in requirements.txt (Related-bug: #1434093)
+
 * Mon Mar 02 2015 Mikhail Ivanov <mivanov@mirantis.com> - 2014.2.2
 - update from global requirements