From b7133e477c13e4bf54b5d1fb0e5e940879c0a1e7 Mon Sep 17 00:00:00 2001
From: zangrc <zangrc.fnst@cn.fujitsu.com>
Date: Tue, 29 Sep 2020 22:58:45 +0800
Subject: python3-oslo.i18n: upgrade 3.23.1 -> 5.0.1

Consolidate inc and bb files into a single bb file.
Since python2 is no longer maintained, the recipe of python2 is removed.

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 .../recipes-devtools/python/python-oslo.i18n.inc   | 32 --------------------
 .../python/python-oslo.i18n_3.23.1.bb              | 33 ---------------------
 .../python/python3-oslo.i18n_git.bb                | 34 +++++++++++++++++++++-
 3 files changed, 33 insertions(+), 66 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-oslo.i18n.inc
 delete mode 100644 meta-openstack/recipes-devtools/python/python-oslo.i18n_3.23.1.bb

(limited to 'meta-openstack')

diff --git a/meta-openstack/recipes-devtools/python/python-oslo.i18n.inc b/meta-openstack/recipes-devtools/python/python-oslo.i18n.inc
deleted file mode 100644
index 3c0e74c..0000000
--- a/meta-openstack/recipes-devtools/python/python-oslo.i18n.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "oslo.i18n library"
-HOMEPAGE = "http://launchpad.net/oslo"
-SECTION = "devel/python"
-LICENSE = "Apache-2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
-
-PV = "3.17.0+git${SRCPV}"
-SRCREV = "f2729cd36f8694a6ec53a0e700599ddf4427440d"
-
-SRCNAME = "oslo.i18n"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike"
-
-S = "${WORKDIR}/git"
-
-# DEPENDS_default: python-pip
-
-DEPENDS += " \
-        ${PYTHON_PN}-pip \
-        ${PYTHON_PN}-pbr \
-        "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
-        ${PYTHON_PN}-pbr-native \
-        "
-
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
-        ${PYTHON_PN}-babel \
-        ${PYTHON_PN}-pbr \
-        ${PYTHON_PN}-six \
-        "
diff --git a/meta-openstack/recipes-devtools/python/python-oslo.i18n_3.23.1.bb b/meta-openstack/recipes-devtools/python/python-oslo.i18n_3.23.1.bb
deleted file mode 100644
index 1dedfa2..0000000
--- a/meta-openstack/recipes-devtools/python/python-oslo.i18n_3.23.1.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "oslo.i18n library"
-HOMEPAGE = "http://launchpad.net/oslo"
-SECTION = "devel/python"
-LICENSE = "Apache-2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
-
-SRCREV = "20bbee510b9714075b7f48f7c3968d7e2bd21a8a"
-
-SRCNAME = "oslo.i18n"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master"
-
-S = "${WORKDIR}/git"
-
-inherit setuptools3
-
-# DEPENDS_default: python-pip
-
-DEPENDS += " \
-        python-pip \
-        python-pbr \
-        "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
-        python-pbr-native \
-        "
-
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
-        python-babel \
-        python-pbr \
-        python-six \
-        "
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb
index 5a06622..6cfd374 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb
@@ -1,2 +1,34 @@
+DESCRIPTION = "oslo.i18n library"
+HOMEPAGE = "http://launchpad.net/oslo"
+SECTION = "devel/python"
+LICENSE = "Apache-2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
+
+PV = "5.0.1+git${SRCPV}"
+SRCREV = "73187bd86903fc87665a829c9a0c714db6aa3022"
+
+SRCNAME = "oslo.i18n"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git"
+
 inherit setuptools3
-require python-oslo.i18n.inc
+
+S = "${WORKDIR}/git"
+
+# DEPENDS_default: python-pip
+
+DEPENDS += " \
+        ${PYTHON_PN}-pip \
+        ${PYTHON_PN}-pbr \
+        "
+
+# Satisfy setup.py 'setup_requires'
+DEPENDS += " \
+        ${PYTHON_PN}-pbr-native \
+        "
+
+# RDEPENDS_default: 
+RDEPENDS_${PN} += " \
+        ${PYTHON_PN}-babel \
+        ${PYTHON_PN}-pbr \
+        ${PYTHON_PN}-six \
+        "
-- 
cgit v1.2.3-54-g00ecf