From 1a7ac38723059420debad0b9813bbba8095eb895 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Wed, 26 Feb 2014 14:18:02 -0500
Subject: django: uprev openstack-auth and django-core

Horizon's Havana dependencies indicate that we should be using a 1.1.x openstack
auth, and a newer django interface. Updating these two packages allows horizon
to sucessfully add and modify users/roles, etc.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../python/python-django-openstack-auth_1.0.11.bb  | 22 ----------------------
 .../python/python-django-openstack-auth_1.1.4.bb   | 22 ++++++++++++++++++++++
 .../recipes-devtools/python/python-django_1.4.5.bb | 21 ---------------------
 .../recipes-devtools/python/python-django_1.5.5.bb | 21 +++++++++++++++++++++
 4 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-django-openstack-auth_1.0.11.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-django-openstack-auth_1.1.4.bb
 delete mode 100644 meta-openstack/recipes-devtools/python/python-django_1.4.5.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-django_1.5.5.bb

(limited to 'meta-openstack/recipes-devtools')

diff --git a/meta-openstack/recipes-devtools/python/python-django-openstack-auth_1.0.11.bb b/meta-openstack/recipes-devtools/python/python-django-openstack-auth_1.0.11.bb
deleted file mode 100644
index 26c8da3..0000000
--- a/meta-openstack/recipes-devtools/python/python-django-openstack-auth_1.0.11.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "A Django authentication backend for use with the OpenStack Keystone backend."
-HOMEPAGE = "http://django_openstack_auth.readthedocs.org/"
-SECTION = "devel/python"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=71fb36bc2e8b28fc3c770efe4d88b514"
-
-PR = "r0"
-SRCNAME = "django_openstack_auth"
-
-SRC_URI = "https://pypi.python.org/packages/source/d/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
-"
-
-SRC_URI[md5sum] = "79e18b4bd3771adfc9cbd5ac0502a8b4"
-SRC_URI[sha256sum] = "ac5a6f33457bc9e808c5bb9dbec0b2dbd36161c885559241e372bb34b2c9fa77"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools 
-
-RDEPENDS_${PN} += "python-django  \
-	python-keystoneclient  \
-	"
\ No newline at end of file
diff --git a/meta-openstack/recipes-devtools/python/python-django-openstack-auth_1.1.4.bb b/meta-openstack/recipes-devtools/python/python-django-openstack-auth_1.1.4.bb
new file mode 100644
index 0000000..d38b83a
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-django-openstack-auth_1.1.4.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "A Django authentication backend for use with the OpenStack Keystone backend."
+HOMEPAGE = "http://django_openstack_auth.readthedocs.org/"
+SECTION = "devel/python"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
+
+PR = "r0"
+SRCNAME = "django_openstack_auth"
+
+SRC_URI = "https://pypi.python.org/packages/source/d/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
+"
+
+SRC_URI[md5sum] = "01388af8675c3ddb72dbf9fe3fc1adee"
+SRC_URI[sha256sum] = "1eea7ac2cdf701fcc0afd6550f5b90ce821516699372bfe4940159c0653d6254"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools 
+
+RDEPENDS_${PN} += "python-django  \
+	python-keystoneclient  \
+	"
\ No newline at end of file
diff --git a/meta-openstack/recipes-devtools/python/python-django_1.4.5.bb b/meta-openstack/recipes-devtools/python/python-django_1.4.5.bb
deleted file mode 100644
index 1d56757..0000000
--- a/meta-openstack/recipes-devtools/python/python-django_1.4.5.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "A high-level Python Web framework"
-HOMEPAGE = "http://www.djangoproject.com/"
-SECTION = "devel/python"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fa8608154dcdd4029ae653131d4b7365"
-
-PR = "r0"
-SRCNAME = "Django"
-
-SRC_URI = "https://pypi.python.org/packages/source/D/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
-"
-
-SRC_URI[md5sum] = "851d00905eb70e4aa6384b3b8b111fb7"
-SRC_URI[sha256sum] = "0e1e8c4217299672bbf9404994717fca2d8d4b7a4f7b8b3b74d413e1fda81428"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
-
-FILES_${PN} += "${datadir}/django/*"
-
diff --git a/meta-openstack/recipes-devtools/python/python-django_1.5.5.bb b/meta-openstack/recipes-devtools/python/python-django_1.5.5.bb
new file mode 100644
index 0000000..36302fd
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-django_1.5.5.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "A high-level Python Web framework"
+HOMEPAGE = "http://www.djangoproject.com/"
+SECTION = "devel/python"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=fa8608154dcdd4029ae653131d4b7365"
+
+PR = "r1"
+SRCNAME = "Django"
+
+SRC_URI = "https://pypi.python.org/packages/source/D/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
+"
+
+SRC_URI[md5sum] = "e33355ee4bb2cbb4ab3954d3dff5eddd"
+SRC_URI[sha256sum] = "6ae69c1dfbfc9d0c44ae80e2fbe48e59bbbbb70e8df66ad2b7029bd39947d71d"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+FILES_${PN} += "${datadir}/django/*"
+
-- 
cgit v1.2.3-54-g00ecf