From d60764e54a6c969e9c125b9cdbea6b6454d00792 Mon Sep 17 00:00:00 2001
From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Date: Mon, 16 Sep 2019 10:45:44 +0800
Subject: python-osc-lib: Python3 version fix

Specifies the major Python version being built using PYTHON_PN.

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 .../recipes-devtools/python/python-osc-lib.inc     | 27 ++++++++++++++--------
 .../python/python-osc-lib_1.13.0.bb                |  7 +-----
 .../python/python3-osc-lib_1.13.0.bb               |  8 +------
 3 files changed, 19 insertions(+), 23 deletions(-)

(limited to 'meta-openstack')

diff --git a/meta-openstack/recipes-devtools/python/python-osc-lib.inc b/meta-openstack/recipes-devtools/python/python-osc-lib.inc
index 58e994c..0589137 100644
--- a/meta-openstack/recipes-devtools/python/python-osc-lib.inc
+++ b/meta-openstack/recipes-devtools/python/python-osc-lib.inc
@@ -7,17 +7,24 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 SRC_URI[md5sum] = "5e91028524b50a72f9913ccd2994cf77"
 SRC_URI[sha256sum] = "9dcd3b55bd887525a7020a8adbabb661a340fc4a4a707950dc1c6f0b286cce77"
 
+inherit pypi
+
+# Satisfy setup.py 'setup_requires'
+DEPENDS += " \
+        ${PYTHON_PN}-pbr-native \
+        "
+
 RDEPENDS_${PN} += " \
-        python-pbr \
-        python-six \
-        python-babel \
-        python-cliff \
-        python-keystoneauth1 \
-        python-os-client-config \
-        python-oslo.i18n \
-        python-oslo.utils \
-        python-simplejson \
-        python-stevedore \
+        ${PYTHON_PN}-pbr \
+        ${PYTHON_PN}-six \
+        ${PYTHON_PN}-babel \
+        ${PYTHON_PN}-cliff \
+        ${PYTHON_PN}-keystoneauth1 \
+        ${PYTHON_PN}-os-client-config \
+        ${PYTHON_PN}-oslo.i18n \
+        ${PYTHON_PN}-oslo.utils \
+        ${PYTHON_PN}-simplejson \
+        ${PYTHON_PN}-stevedore \
         "
 
 CLEANBROKEN = "1"
diff --git a/meta-openstack/recipes-devtools/python/python-osc-lib_1.13.0.bb b/meta-openstack/recipes-devtools/python/python-osc-lib_1.13.0.bb
index 4ea2de2..d8c72e7 100644
--- a/meta-openstack/recipes-devtools/python/python-osc-lib_1.13.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-osc-lib_1.13.0.bb
@@ -1,7 +1,2 @@
-inherit setuptools pypi
+inherit setuptools
 require python-osc-lib.inc
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
-        python-pbr-native \
-        "
diff --git a/meta-openstack/recipes-devtools/python/python3-osc-lib_1.13.0.bb b/meta-openstack/recipes-devtools/python/python3-osc-lib_1.13.0.bb
index 63265d9..256c286 100644
--- a/meta-openstack/recipes-devtools/python/python3-osc-lib_1.13.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-osc-lib_1.13.0.bb
@@ -1,8 +1,2 @@
-inherit setuptools3 pypi
+inherit setuptools3
 require python-osc-lib.inc
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
-        python3-pbr-native \
-        "
-
-- 
cgit v1.2.3-54-g00ecf