From c683dba11db406a52687bb76f339707692fabf6b Mon Sep 17 00:00:00 2001 From: zhipengl Date: Tue, 28 Aug 2018 01:57:32 +0800 Subject: [PATCH] upgrade python-wsme to CentOS 7.5 version Story: 2003389 Task: 24486 Depends-On: https://review.openstack.org/#/c/596674/ Change-Id: I15fd3c175aef1b016b8d892d3a27956beb915ce1 Signed-off-by: zhipengl --- ...te-package-versioning-for-TIS-format.patch | 10 ++++----- ...lientSideError-logging-verbosity-fix.patch | 21 ++++++++++--------- openstack/python-wsme/centos/srpm_path | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/openstack/python-wsme/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/openstack/python-wsme/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index a3425412..f9635694 100644 --- a/openstack/python-wsme/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/openstack/python-wsme/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -1,4 +1,4 @@ -From 645004eec0d66fdb5b76738a8077ea93ac7f7148 Mon Sep 17 00:00:00 2001 +From 337ef0a6bdaa310f008f58a544c7d5e48dbcf48a Mon Sep 17 00:00:00 2001 From: Don Penney Date: Mon, 26 Sep 2016 17:32:55 -0400 Subject: [PATCH] Update package versioning for TIS format @@ -8,18 +8,18 @@ Subject: [PATCH] Update package versioning for TIS format 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/python-wsme.spec b/SPECS/python-wsme.spec -index 8f7fd22..943c1cd 100644 +index 2d03df4..ccecfc2 100644 --- a/SPECS/python-wsme.spec +++ b/SPECS/python-wsme.spec -@@ -12,7 +12,7 @@ +@@ -14,7 +14,7 @@ Name: python-%{lpypi_name} - Version: 0.8.0 + Version: 0.9.2 -Release: 1%{?dist} +Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} Summary: Web Services Made Easy License: MIT -- -1.8.3.1 +2.7.4 diff --git a/openstack/python-wsme/centos/meta_patches/meta-patch-ClientSideError-logging-verbosity-fix.patch b/openstack/python-wsme/centos/meta_patches/meta-patch-ClientSideError-logging-verbosity-fix.patch index 72253695..35bc7140 100644 --- a/openstack/python-wsme/centos/meta_patches/meta-patch-ClientSideError-logging-verbosity-fix.patch +++ b/openstack/python-wsme/centos/meta_patches/meta-patch-ClientSideError-logging-verbosity-fix.patch @@ -1,20 +1,20 @@ -From f45245a7435af40a0166e8c5e5fb68383d7774d8 Mon Sep 17 00:00:00 2001 +From 6ded6aa6c81808a716628196caa91f20545e2cc0 Mon Sep 17 00:00:00 2001 From: Kam Nasim Date: Tue, 3 Jan 2017 13:36:15 -0500 Subject: [PATCH] meta patch for ClientSideError logging verbosity fix. --- - SPECS/python-wsme.spec | 6 ++++++ - 1 file changed, 6 insertions(+) + SPECS/python-wsme.spec | 7 +++++++ + 1 file changed, 7 insertions(+) diff --git a/SPECS/python-wsme.spec b/SPECS/python-wsme.spec -index 943c1cd..7f392b4 100644 +index 2f84ba5..2d03df4 100644 --- a/SPECS/python-wsme.spec +++ b/SPECS/python-wsme.spec -@@ -18,6 +18,10 @@ Summary: Web Services Made Easy +@@ -20,6 +20,10 @@ Summary: Web Services Made Easy License: MIT URL: https://pypi.python.org/pypi/WSME - Source0: http://pypi.python.org/packages/source/W/%{pypi_name}/%{pypi_name}-%{version}.tar.gz + Source0: http://tarballs.openstack.org/wsme/%{pypi_name}-%{version}.tar.gz + +# WRS +Patch0001: 0001-log-client-side-errors.patch @@ -22,15 +22,16 @@ index 943c1cd..7f392b4 100644 BuildArch: noarch %description -@@ -87,6 +91,8 @@ manipulate the request and the response objects. +@@ -83,6 +87,9 @@ manipulate the request and the response objects. %prep - %setup -q -n %{pypi_name}-%{version} + %setup -q -n %{pypi_name}-%{upstream_version} +# Apply WRS patches +%patch0001 -p1 - ++ %build %{__python2} setup.py build + %if 0%{?with_python3} -- -1.8.3.1 +2.7.4 diff --git a/openstack/python-wsme/centos/srpm_path b/openstack/python-wsme/centos/srpm_path index 8f04b17e..85a6818e 100644 --- a/openstack/python-wsme/centos/srpm_path +++ b/openstack/python-wsme/centos/srpm_path @@ -1 +1 @@ -mirror:Source/python-wsme-0.8.0-1.el7.src.rpm +mirror:Source/python-wsme-0.9.2-1.el7.src.rpm