From 55e8793f49b869971045a40cb1c2c6fd90e58436 Mon Sep 17 00:00:00 2001 From: Lucas de Ataides Date: Tue, 27 Jun 2023 15:50:50 -0300 Subject: [PATCH] Upversion python-neutronclient to 9.0.0-2 As part of the STX-Openstack upversion to ANTELOPE, the python- neutronclient is being upversioned to version 9.0.0-2, which is the latest supported on ANTELOPE [1]. All patches were updated in order to make the package buildable in the new version. This change also adds the sha256sum field to the downloader path, as it is being recommended to use it in the place of the md5sum. [1] https://releases.openstack.org/antelope/#antelope-python-neutronclient Test Plan: PASS: Build the python-neutronclient package Story: 2010715 Task: 48135 Change-Id: I01a50f0e5b86dbe7acbbecf40dd3d095b2542f5d Signed-off-by: Lucas de Ataides --- .../deb_patches/0001-Add-wheel-package.patch | 15 +++++++-------- ...nt.patch => 0002-Remove-openstackclient.patch} | 6 +++--- .../debian/deb_patches/series | 2 +- .../python-neutronclient/debian/meta_data.yaml | 9 +++++---- 4 files changed, 16 insertions(+), 16 deletions(-) rename upstream/openstack/python-neutronclient/debian/deb_patches/{remove-openstackclient.patch => 0002-Remove-openstackclient.patch} (87%) diff --git a/upstream/openstack/python-neutronclient/debian/deb_patches/0001-Add-wheel-package.patch b/upstream/openstack/python-neutronclient/debian/deb_patches/0001-Add-wheel-package.patch index b8dd20ee..ab1e0c3c 100644 --- a/upstream/openstack/python-neutronclient/debian/deb_patches/0001-Add-wheel-package.patch +++ b/upstream/openstack/python-neutronclient/debian/deb_patches/0001-Add-wheel-package.patch @@ -1,4 +1,4 @@ -From 6586f6e4ae2954382a638f80c8b039c8c446ad58 Mon Sep 17 00:00:00 2001 +From a82f5a067982c96990255752e714ddb49156a763 Mon Sep 17 00:00:00 2001 From: Charles Short Date: Wed, 27 Oct 2021 13:25:54 +0000 Subject: [PATCH] Add wheel package @@ -7,15 +7,15 @@ Add python3-neutronclient-wheel package. Signed-off-by: Charles Short --- - debian/control | 15 +++++++++++++++ + debian/control | 14 ++++++++++++++ debian/rules | 2 +- - 2 files changed, 16 insertions(+), 1 deletion(-) + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control -index 9b81157..6585170 100644 +index 9b81157..8e22bc1 100644 --- a/debian/control +++ b/debian/control -@@ -73,3 +73,18 @@ Description: client API library for Neutron - Python 3.x +@@ -73,3 +73,17 @@ Description: client API library for Neutron - Python 3.x capabilities (e.g., QoS, ACLs, network monitoring, etc). . This package provides the client and Python 3.x module. @@ -33,9 +33,8 @@ index 9b81157..6585170 100644 + capabilities (e.g., QoS, ACLs, network monitoring, etc). + . + This package contains the Python3 wheel. -+ diff --git a/debian/rules b/debian/rules -index b99f400..9fda3e8 100755 +index b886612..ee5df36 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ override_dh_auto_build: @@ -48,5 +47,5 @@ index b99f400..9fda3e8 100755 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) -- -2.30.2 +2.25.1 diff --git a/upstream/openstack/python-neutronclient/debian/deb_patches/remove-openstackclient.patch b/upstream/openstack/python-neutronclient/debian/deb_patches/0002-Remove-openstackclient.patch similarity index 87% rename from upstream/openstack/python-neutronclient/debian/deb_patches/remove-openstackclient.patch rename to upstream/openstack/python-neutronclient/debian/deb_patches/0002-Remove-openstackclient.patch index 9c7eac23..f9606448 100644 --- a/upstream/openstack/python-neutronclient/debian/deb_patches/remove-openstackclient.patch +++ b/upstream/openstack/python-neutronclient/debian/deb_patches/0002-Remove-openstackclient.patch @@ -1,4 +1,4 @@ -From 05a9cb2d2c40aae1061191cd1f8627a7f8986fee Mon Sep 17 00:00:00 2001 +From c6174b50da794c8ecdc6892d7279c20c381c2298 Mon Sep 17 00:00:00 2001 From: Charles Short Date: Mon, 29 Nov 2021 20:54:00 +0000 Subject: [PATCH] Remove openstackclient @@ -13,7 +13,7 @@ Signed-off-by: Charles Short 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control -index ac5fc13..097dadf 100644 +index 8e22bc1..aecb934 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,6 @@ Build-Depends-Indep: @@ -25,5 +25,5 @@ index ac5fc13..097dadf 100644 python3-os-client-config, python3-osc-lib, -- -2.30.2 +2.25.1 diff --git a/upstream/openstack/python-neutronclient/debian/deb_patches/series b/upstream/openstack/python-neutronclient/debian/deb_patches/series index 8478f3b7..08ebae4e 100644 --- a/upstream/openstack/python-neutronclient/debian/deb_patches/series +++ b/upstream/openstack/python-neutronclient/debian/deb_patches/series @@ -1,2 +1,2 @@ 0001-Add-wheel-package.patch -remove-openstackclient.patch +0002-Remove-openstackclient.patch diff --git a/upstream/openstack/python-neutronclient/debian/meta_data.yaml b/upstream/openstack/python-neutronclient/debian/meta_data.yaml index d9e2e609..88d42994 100644 --- a/upstream/openstack/python-neutronclient/debian/meta_data.yaml +++ b/upstream/openstack/python-neutronclient/debian/meta_data.yaml @@ -1,10 +1,11 @@ --- debname: python-neutronclient -debver: 1:7.2.1-2 +debver: 9.0.0-2 dl_path: - name: python-neutronclient-debian-7.2.1-2.tar.gz - url: https://salsa.debian.org/openstack-team/clients/python-neutronclient/-/archive/debian/7.2.1-2/python-neutronclient-debian-7.2.1-2.tar.gz - md5sum: b48160cf9342e7123195d9748736cf99 + name: python-neutronclient-debian-9.0.0-2.tar.gz + url: https://salsa.debian.org/openstack-team/clients/python-neutronclient/-/archive/debian/9.0.0-2/python-neutronclient-debian-9.0.0-2.tar.gz + md5sum: a278bbc82bb9965e0845069b2d2aa382 + sha256sum: bbcc33d3b4f9293e84f8b089457919291e7beac56d0535b5daa981de033014ea revision: dist: $STX_DIST GITREVCOUNT: