3 files changed, 5 insertions, 3 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-kombu.inc b/meta-openstack/recipes-devtools/python/python-kombu.inc
index 3053f71..9918281 100644
--- a/meta-openstack/recipes-devtools/python/python-kombu.inc
+++ b/meta-openstack/recipes-devtools/python/python-kombu.inc
@@ -7,8 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=daea7c168428449fbee05e644df929f4"
 SRC_URI[md5sum] = "4eb5f1e6f669e04f5bd0c627c7467156"
 SRC_URI[sha256sum] = "e5f0312dfb9011bebbf528ccaf118a6c2b5c3b8244451f08381fb23e7715809b"
 
+inherit pypi
+
 FILES_${PN}-doc += "${datadir}/${SRCNAME}"
 
 RDEPENDS_${PN} = " \
-        python-amqp \
+        ${PYTHON_PN}-amqp \
         "
diff --git a/meta-openstack/recipes-devtools/python/python-kombu_4.6.4.bb b/meta-openstack/recipes-devtools/python/python-kombu_4.6.4.bb
index 28b6258..8c5c4d6 100644
--- a/meta-openstack/recipes-devtools/python/python-kombu_4.6.4.bb
+++ b/meta-openstack/recipes-devtools/python/python-kombu_4.6.4.bb
@@ -1,3 +1,3 @@
-inherit setuptools pypi
+inherit setuptools
 require python-kombu.inc
 
diff --git a/meta-openstack/recipes-devtools/python/python3-kombu_4.6.4.bb b/meta-openstack/recipes-devtools/python/python3-kombu_4.6.4.bb
index fc752d9..11b0826 100644
--- a/meta-openstack/recipes-devtools/python/python3-kombu_4.6.4.bb
+++ b/meta-openstack/recipes-devtools/python/python3-kombu_4.6.4.bb
@@ -1,2 +1,2 @@
-inherit setuptools3 pypi
+inherit setuptools3
 require python-kombu.inc