diff --git a/centos_iso_image.inc b/centos_iso_image.inc index bb6f06d7..714b0d66 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -47,7 +47,7 @@ #rabbitmq-server # python-wsme -#python2-wsme +python3-wsme # openstack-barbican diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 3b3f7f72..5cdd4ee2 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -21,4 +21,4 @@ openstack/python-oslo-messaging openstack/rabbitmq-server #openstack/python-openstackclient #openstack/python-openstacksdk -#openstack/python-wsme +openstack/python-wsme diff --git a/centos_srpms_centos.lst b/centos_srpms_centos.lst index 642a16af..43c962b2 100644 --- a/centos_srpms_centos.lst +++ b/centos_srpms_centos.lst @@ -3,4 +3,5 @@ python-openstackdocstheme-1.11.0-1.el7.src.rpm python-osc-lib-1.7.0-1.el7.src.rpm python-oslo-messaging-10.2.0-2.el8.src.rpm python-os-vif-1.9.1-1.el7.src.rpm -python-wsme-0.9.2-1.el7.src.rpm +python-wsme-0.9.3-1.el8.src.rpm +rabbitmq-server-3.6.5-1.el7.src.rpm diff --git a/openstack/python-wsme/centos/build_srpm.data b/openstack/python-wsme/centos/build_srpm.data index d3f64f33..8aeb5536 100644 --- a/openstack/python-wsme/centos/build_srpm.data +++ b/openstack/python-wsme/centos/build_srpm.data @@ -1 +1 @@ -TIS_PATCH_VER=3 +TIS_PATCH_VER=1 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 f9635694..af21a032 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 @@ -3,6 +3,7 @@ From: Don Penney Date: Mon, 26 Sep 2016 17:32:55 -0400 Subject: [PATCH] Update package versioning for TIS format +Signed-off-by: Yong Fu --- SPECS/python-wsme.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -11,15 +12,15 @@ diff --git a/SPECS/python-wsme.spec b/SPECS/python-wsme.spec index 2d03df4..ccecfc2 100644 --- a/SPECS/python-wsme.spec +++ b/SPECS/python-wsme.spec -@@ -14,7 +14,7 @@ +@@ -23,7 +23,7 @@ Name: python-%{lpypi_name} - Version: 0.9.2 + Version: 0.9.3 -Release: 1%{?dist} -+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} ++Release: 1.el8%{?_tis_dist}.%{tis_patch_ver} Summary: Web Services Made Easy License: MIT -- -2.7.4 +2.17.1 diff --git a/openstack/python-wsme/centos/meta_patches/0003-Remove-TOX-calls-from-build.patch b/openstack/python-wsme/centos/meta_patches/0003-Remove-TOX-calls-from-build.patch deleted file mode 100644 index 3608140e..00000000 --- a/openstack/python-wsme/centos/meta_patches/0003-Remove-TOX-calls-from-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6aa8e5b13954e7b2ef2ffe619c8818db4a109f6b Mon Sep 17 00:00:00 2001 -From: Al Bailey -Date: Tue, 6 Mar 2018 09:56:17 -0600 -Subject: Remove TOX calls from build - ---- - SPECS/python-wsme.spec | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/SPECS/python-wsme.spec b/SPECS/python-wsme.spec -index c778f97..403c331 100644 ---- a/SPECS/python-wsme.spec -+++ b/SPECS/python-wsme.spec -@@ -102,12 +102,6 @@ manipulate the request and the response objects. - %{__python3} setup.py install --skip-build --root %{buildroot} - %endif - --%check --%{__python2} setup.py test --%if 0%{?with_python3} --%{__python3} setup.py test --%endif -- - %files -n python2-%{lpypi_name} - %doc README.rst examples/ - %license LICENSE --- -2.7.4 - diff --git a/openstack/python-wsme/centos/meta_patches/PATCH_ORDER b/openstack/python-wsme/centos/meta_patches/PATCH_ORDER index 6ef03247..0e99470b 100644 --- a/openstack/python-wsme/centos/meta_patches/PATCH_ORDER +++ b/openstack/python-wsme/centos/meta_patches/PATCH_ORDER @@ -1,3 +1,2 @@ meta-patch-ClientSideError-logging-verbosity-fix.patch 0001-Update-package-versioning-for-TIS-format.patch -0003-Remove-TOX-calls-from-build.patch 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 35bc7140..2af29ee6 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 @@ -3,6 +3,7 @@ From: Kam Nasim Date: Tue, 3 Jan 2017 13:36:15 -0500 Subject: [PATCH] meta patch for ClientSideError logging verbosity fix. +Signed-off-by: Yong Fu --- SPECS/python-wsme.spec | 7 +++++++ 1 file changed, 7 insertions(+) @@ -11,27 +12,27 @@ diff --git a/SPECS/python-wsme.spec b/SPECS/python-wsme.spec index 2f84ba5..2d03df4 100644 --- a/SPECS/python-wsme.spec +++ b/SPECS/python-wsme.spec -@@ -20,6 +20,10 @@ Summary: Web Services Made Easy +@@ -29,6 +29,10 @@ Summary: Web Services Made Easy License: MIT URL: https://pypi.python.org/pypi/WSME - Source0: http://tarballs.openstack.org/wsme/%{pypi_name}-%{version}.tar.gz + Source0: https://pypi.python.org/packages/source/W/%{pypi_name}/%{pypi_name}-%{version}.tar.gz + -+# WRS ++# STX +Patch0001: 0001-log-client-side-errors.patch + BuildArch: noarch %description -@@ -83,6 +87,9 @@ manipulate the request and the response objects. +@@ -78,6 +82,9 @@ manipulate the request and the response objects. %prep %setup -q -n %{pypi_name}-%{upstream_version} -+# Apply WRS patches ++# Apply STX patches +%patch0001 -p1 + %build - %{__python2} setup.py build - %if 0%{?with_python3} + %{pyver_build} + -- -2.7.4 +2.17.1 diff --git a/openstack/python-wsme/centos/srpm_path b/openstack/python-wsme/centos/srpm_path index 85a6818e..5c2feea9 100644 --- a/openstack/python-wsme/centos/srpm_path +++ b/openstack/python-wsme/centos/srpm_path @@ -1 +1 @@ -mirror:Source/python-wsme-0.9.2-1.el7.src.rpm +mirror:Source/python-wsme-0.9.3-1.el8.src.rpm