From a4f92d1d49c9b9e270284d81a708e22a25631cc1 Mon Sep 17 00:00:00 2001 From: Maksym Yatsenko Date: Thu, 19 Mar 2015 20:02:03 +0200 Subject: [PATCH] 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: I56978d85332998cf96db0e244b9668c9b44af32e --- ...st-kombu-version-in-requirements.txt.patch | 30 +++++++++++++++++++ rpm/SPECS/python-django-horizon.spec | 3 ++ trusty/debian/changelog | 6 ++++ ...st-kombu-version-in-requirements.txt.patch | 30 +++++++++++++++++++ trusty/debian/patches/series | 2 +- 5 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 rpm/SOURCES/0001-Adjust-kombu-version-in-requirements.txt.patch create mode 100644 trusty/debian/patches/adjust-kombu-version-in-requirements.txt.patch diff --git a/rpm/SOURCES/0001-Adjust-kombu-version-in-requirements.txt.patch b/rpm/SOURCES/0001-Adjust-kombu-version-in-requirements.txt.patch new file mode 100644 index 0000000..35f5b84 --- /dev/null +++ b/rpm/SOURCES/0001-Adjust-kombu-version-in-requirements.txt.patch @@ -0,0 +1,30 @@ +From 67985017f58d9e4e68b2555aa38afc4b46008b6a Mon Sep 17 00:00:00 2001 +From: Maksym Yatsenko +Date: Thu, 19 Mar 2015 19:51:47 +0200 +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 de06b96..933f3fd 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -16,7 +16,7 @@ django-pyscss>=1.0.3,<=1.0.6 # BSD License (2 clause) + eventlet>=0.15.1,<=0.15.2 + httplib2>=0.7.5,<=0.9 + iso8601>=0.1.9,<=0.1.10 +-kombu>=2.5.0,<=3.0.7 ++kombu>=2.5.0 + # Horizon Utility Requirements + # for SECURE_KEY generation + lockfile>=0.8,<=0.8 +-- +1.9.1 + diff --git a/rpm/SPECS/python-django-horizon.spec b/rpm/SPECS/python-django-horizon.spec index 95f5855..87787a2 100644 --- a/rpm/SPECS/python-django-horizon.spec +++ b/rpm/SPECS/python-django-horizon.spec @@ -29,6 +29,7 @@ Source4: openstack-dashboard-httpd-logging.conf #Patch0009: 0009-remove-runtime-dep-to-python-pbr.patch #Patch0010: 0010-Add-Change-password-link-to-the-RCUE-theme.patch #Patch0011: 0011-.less-replaced-in-rcue.patch +Patch0001: 0001-Adjust-kombu-version-in-requirements.txt.patch # # BuildArch needs to be located below patches in the spec file. Don't ask! @@ -213,6 +214,8 @@ Customization module for OpenStack Dashboard to provide a branded logo. %prep %setup -q -n horizon-%{version} +%patch0001 -p1 + # Use git to manage patches. # http://rwmj.wordpress.com/2011/08/09/nice-rpm-git-patch-management-trick/ #git init diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 02c5f03..97fe8d8 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,9 @@ +horizon (1:2014.2.2-fuel6.1-14.04-3) trusty; urgency=medium + + * fix kombu version in requirements (Related-bug: #1434093) + + -- Maksym Yatsenko Fri, 20 Mar 2015 12:27:24 +0300 + horizon (1:2014.2.2-fuel6.1-14.04-2) trusty; urgency=medium * Update requirements diff --git a/trusty/debian/patches/adjust-kombu-version-in-requirements.txt.patch b/trusty/debian/patches/adjust-kombu-version-in-requirements.txt.patch new file mode 100644 index 0000000..35f5b84 --- /dev/null +++ b/trusty/debian/patches/adjust-kombu-version-in-requirements.txt.patch @@ -0,0 +1,30 @@ +From 67985017f58d9e4e68b2555aa38afc4b46008b6a Mon Sep 17 00:00:00 2001 +From: Maksym Yatsenko +Date: Thu, 19 Mar 2015 19:51:47 +0200 +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 de06b96..933f3fd 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -16,7 +16,7 @@ django-pyscss>=1.0.3,<=1.0.6 # BSD License (2 clause) + eventlet>=0.15.1,<=0.15.2 + httplib2>=0.7.5,<=0.9 + iso8601>=0.1.9,<=0.1.10 +-kombu>=2.5.0,<=3.0.7 ++kombu>=2.5.0 + # Horizon Utility Requirements + # for SECURE_KEY generation + lockfile>=0.8,<=0.8 +-- +1.9.1 + diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series index 42b36b8..71de41b 100644 --- a/trusty/debian/patches/series +++ b/trusty/debian/patches/series @@ -3,6 +3,6 @@ fix-dashboard-manage.patch # Disabled during Grizzly dev. cycle #add_juju_settings_panel.patch - #fix-ubuntu-tests.patch ubuntu_settings.patch +adjust-kombu-version-in-requirements.txt.patch \ No newline at end of file -- 2.45.2