From 67b4b27a1826c01d68de2922523fa3473dbbd92d Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Wed, 6 Nov 2013 09:42:15 -0500
Subject: python-stevedore: uprev version

OpenStack Havana requires a newer version of stevedor, so we uprev to 0.12
and drop our one patch (since it is no longer necessary).

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../remove-distribute-dependency.patch             | 25 ----------------------
 .../python/python-stevedore_0.12.bb                | 17 +++++++++++++++
 .../python/python-stevedore_0.8.bb                 | 18 ----------------
 3 files changed, 17 insertions(+), 43 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-stevedore/remove-distribute-dependency.patch
 create mode 100644 meta-openstack/recipes-devtools/python/python-stevedore_0.12.bb
 delete mode 100644 meta-openstack/recipes-devtools/python/python-stevedore_0.8.bb

(limited to 'meta-openstack')

diff --git a/meta-openstack/recipes-devtools/python/python-stevedore/remove-distribute-dependency.patch b/meta-openstack/recipes-devtools/python/python-stevedore/remove-distribute-dependency.patch
deleted file mode 100644
index 49a68de..0000000
--- a/meta-openstack/recipes-devtools/python/python-stevedore/remove-distribute-dependency.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: stevedore-0.8/setup.py
-===================================================================
---- stevedore-0.8.orig/setup.py
-+++ stevedore-0.8/setup.py
-@@ -1,8 +1,8 @@
- #!/usr/bin/env python
- 
- # Bootstrap installation of Distribute
--import distribute_setup
--distribute_setup.use_setuptools()
-+#import distribute_setup
-+#distribute_setup.use_setuptools()
- 
- from setuptools import setup, find_packages
- 
-@@ -11,8 +11,7 @@ try:
- except IOError:
-     long_description = ''
- 
--install_requires = ['distribute',
--                    ]
-+install_requires = []
- 
- setup(
-     name='stevedore',
diff --git a/meta-openstack/recipes-devtools/python/python-stevedore_0.12.bb b/meta-openstack/recipes-devtools/python/python-stevedore_0.12.bb
new file mode 100644
index 0000000..061f6d4
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-stevedore_0.12.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Manage dynamic plugins for Python applications"
+HOMEPAGE = "https://github.com/dreamhost/stevedore"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+PR = "r0"
+
+SRCNAME = "stevedore"
+SRC_URI = "http://pypi.python.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "8bf1b7bed06bf5ab636784d161f1a494"
+SRC_URI[sha256sum] = "9689a76c09eaeb60b6db5b45aae71de8c53f15d302d790536ac5bf7c47d729eb"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
diff --git a/meta-openstack/recipes-devtools/python/python-stevedore_0.8.bb b/meta-openstack/recipes-devtools/python/python-stevedore_0.8.bb
deleted file mode 100644
index 1309eac..0000000
--- a/meta-openstack/recipes-devtools/python/python-stevedore_0.8.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Manage dynamic plugins for Python applications"
-HOMEPAGE = "https://github.com/dreamhost/stevedore"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PR = "r0"
-
-SRCNAME = "stevedore"
-SRC_URI = "http://pypi.python.org/packages/source/s/stevedore/stevedore-0.8.tar.gz \
-           file://remove-distribute-dependency.patch"
-
-SRC_URI[md5sum] = "8f340230754c2d70e6e34bc6d8678048"
-SRC_URI[sha256sum] = "bf187929f739f86a73ad218193d23bddb34c717c5adb6fd84008c2975043edb6"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
-- 
cgit v1.2.3-54-g00ecf