From 2c5c3b340869ccebaa0e6f0973e07d71acdf8e83 Mon Sep 17 00:00:00 2001 From: SidneyAn Date: Sat, 29 Dec 2018 19:33:14 +0800 Subject: [PATCH] upgrade python-oslo-messaging to CentOS 7.6 version [Patch 2/3] update to version 5.30.6-1 Story: 2004522 Task: 28400 Depends-On: https://review.openstack.org/#/c/627755/ Change-Id: Iea2e5ee2fce293ed37d412557eaad4403ae491bd Signed-off-by: SidneyAn --- .../meta_patches/0004-disable-check-on-build.patch | 5 ++++- .../centos/meta_patches/fix-pifpaf-build-error.patch | 11 +++++++---- ...-heartbeat-rate-to-decrease-polling-interval.patch | 2 +- .../update-package-versioning-for-tis-format.patch | 4 ++-- openstack/python-oslo-messaging/centos/srpm_path | 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/openstack/python-oslo-messaging/centos/meta_patches/0004-disable-check-on-build.patch b/openstack/python-oslo-messaging/centos/meta_patches/0004-disable-check-on-build.patch index 966274e4..8eb4532a 100644 --- a/openstack/python-oslo-messaging/centos/meta_patches/0004-disable-check-on-build.patch +++ b/openstack/python-oslo-messaging/centos/meta_patches/0004-disable-check-on-build.patch @@ -3,12 +3,15 @@ From: jmckenna Date: Thu, 7 Dec 2017 09:12:43 -0500 Subject: [PATCH] Disable check on build +--- + SPECS/python-oslo-messaging.spec | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SPECS/python-oslo-messaging.spec b/SPECS/python-oslo-messaging.spec index 627a1be..648718a 100644 --- a/SPECS/python-oslo-messaging.spec +++ b/SPECS/python-oslo-messaging.spec -@@ -268,11 +268,11 @@ rm -fr doc/build/html/.buildinfo +@@ -281,11 +281,11 @@ rm -fr doc/build/html/.buildinfo %check # Temporarily disabling tests until we have # mock >= 1.2 and pika_pool diff --git a/openstack/python-oslo-messaging/centos/meta_patches/fix-pifpaf-build-error.patch b/openstack/python-oslo-messaging/centos/meta_patches/fix-pifpaf-build-error.patch index 0a3b8461..46f1acaf 100644 --- a/openstack/python-oslo-messaging/centos/meta_patches/fix-pifpaf-build-error.patch +++ b/openstack/python-oslo-messaging/centos/meta_patches/fix-pifpaf-build-error.patch @@ -3,12 +3,15 @@ From: jmckenna Date: Thu, 7 Dec 2017 09:10:31 -0500 Subject: [PATCH] refactor patch "fix pifpaf build error" +--- + SPECS/python-oslo-messaging.spec | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/SPECS/python-oslo-messaging.spec b/SPECS/python-oslo-messaging.spec index abc5dce..627a1be 100644 --- a/SPECS/python-oslo-messaging.spec +++ b/SPECS/python-oslo-messaging.spec -@@ -52,6 +52,7 @@ BuildRequires: python-tenacity +@@ -55,6 +55,7 @@ BuildRequires: python-tenacity BuildRequires: python-testrepository BuildRequires: python-testscenarios BuildRequires: python-testtools @@ -16,7 +19,7 @@ index abc5dce..627a1be 100644 Requires: python-amqp >= 2.1.0 -@@ -135,6 +136,7 @@ Requires: python-oslotest +@@ -144,6 +145,7 @@ Requires: python-oslotest Requires: python-testrepository Requires: python-testscenarios Requires: python-testtools @@ -24,7 +27,7 @@ index abc5dce..627a1be 100644 %description -n python2-%{pkg_name}-tests Tests for the OpenStack common messaging library. -@@ -165,6 +167,7 @@ BuildRequires: python3-tenacity +@@ -174,6 +176,7 @@ BuildRequires: python3-tenacity BuildRequires: python3-testrepository BuildRequires: python3-testscenarios BuildRequires: python3-testtools @@ -32,7 +35,7 @@ index abc5dce..627a1be 100644 Requires: python3-amqp >= 2.1.0 Requires: python3-debtcollector >= 1.2.0 -@@ -217,6 +220,7 @@ Requires: python3-oslotest +@@ -228,6 +231,7 @@ Requires: python3-oslotest Requires: python3-testrepository Requires: python3-testscenarios Requires: python3-testtools diff --git a/openstack/python-oslo-messaging/centos/meta_patches/spec-rabbit-increase-heartbeat-rate-to-decrease-polling-interval.patch b/openstack/python-oslo-messaging/centos/meta_patches/spec-rabbit-increase-heartbeat-rate-to-decrease-polling-interval.patch index eaf17222..4becf19b 100644 --- a/openstack/python-oslo-messaging/centos/meta_patches/spec-rabbit-increase-heartbeat-rate-to-decrease-polling-interval.patch +++ b/openstack/python-oslo-messaging/centos/meta_patches/spec-rabbit-increase-heartbeat-rate-to-decrease-polling-interval.patch @@ -12,7 +12,7 @@ diff --git a/SPECS/python-oslo-messaging.spec b/SPECS/python-oslo-messaging.spec index 361f93e..55e8567 100644 --- a/SPECS/python-oslo-messaging.spec +++ b/SPECS/python-oslo-messaging.spec -@@ -14,6 +14,10 @@ Summary: OpenStack common messaging library +@@ -17,6 +17,10 @@ Summary: OpenStack common messaging library License: ASL 2.0 URL: https://launchpad.net/oslo Source0: https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz diff --git a/openstack/python-oslo-messaging/centos/meta_patches/update-package-versioning-for-tis-format.patch b/openstack/python-oslo-messaging/centos/meta_patches/update-package-versioning-for-tis-format.patch index cb82830b..cc711912 100644 --- a/openstack/python-oslo-messaging/centos/meta_patches/update-package-versioning-for-tis-format.patch +++ b/openstack/python-oslo-messaging/centos/meta_patches/update-package-versioning-for-tis-format.patch @@ -12,10 +12,10 @@ diff --git a/SPECS/python-oslo-messaging.spec b/SPECS/python-oslo-messaging.spec index 59562ac..929e8e0 100644 --- a/SPECS/python-oslo-messaging.spec +++ b/SPECS/python-oslo-messaging.spec -@@ -8,7 +8,7 @@ +@@ -11,7 +11,7 @@ Name: python-oslo-messaging - Version: 5.30.0 + Version: 5.30.6 -Release: 1%{?dist} +Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} Summary: OpenStack common messaging library diff --git a/openstack/python-oslo-messaging/centos/srpm_path b/openstack/python-oslo-messaging/centos/srpm_path index db0845d4..8f4ab8a3 100644 --- a/openstack/python-oslo-messaging/centos/srpm_path +++ b/openstack/python-oslo-messaging/centos/srpm_path @@ -1 +1 @@ -mirror:Source/python-oslo-messaging-5.30.0-1.el7.src.rpm +mirror:Source/python-oslo-messaging-5.30.6-1.el7.src.rpm