From 0925f62839abd10d6353321b5feda9ffa17f78d9 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Fri, 13 Mar 2015 11:59:35 -0400
Subject: horizon: fix kilo login / page rendering

With this commit, we add a missing dependency (pint) and update the
angular support libary to the proper version for kilo support.

We can now render and log into the dashboard.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-devtools/python/python-horizon_git.bb  |  1 +
 .../recipes-devtools/python/python-pint_0.6.bb     | 21 +++++++++++++++++
 .../python/python-xstatic-angular_1.2.1.1.bb       | 27 ----------------------
 .../python/python-xstatic-angular_1.3.7.0.bb       | 27 ++++++++++++++++++++++
 4 files changed, 49 insertions(+), 27 deletions(-)
 create mode 100644 meta-openstack/recipes-devtools/python/python-pint_0.6.bb
 delete mode 100644 meta-openstack/recipes-devtools/python/python-xstatic-angular_1.2.1.1.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-xstatic-angular_1.3.7.0.bb

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

diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
index 154c447..d0a9bab 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -32,6 +32,7 @@ RDEPENDS_${PN} += " python-django \
     python-swiftclient \
     python-lockfile \
     python-pyyaml \
+    python-pint \
     python-xstatic \
     python-xstatic-jquery \
     python-xstatic-angular \
diff --git a/meta-openstack/recipes-devtools/python/python-pint_0.6.bb b/meta-openstack/recipes-devtools/python/python-pint_0.6.bb
new file mode 100644
index 0000000..9e6c689
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-pint_0.6.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Physical quantities module"
+HOMEPAGE = "https://pypi.python.org/pypi/Pint"
+SECTION = "devel/python"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=bccf824202692270a1e0829a62e3f47b"
+
+PR = "r0"
+SRCNAME = "Pint"
+
+SRC_URI = "http://pypi.python.org/packages/source/P/${SRCNAME}/${SRCNAME}-${PV}.zip"
+
+SRC_URI[md5sum] = "88aa0918019071546b10c5fbdc91ae5e"
+SRC_URI[sha256sum] = "b1ab3b589ca4d78689233a007abd5a7eec4ea65302cabaed06932d20f2a9e748"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
+
+RDEPENDS_${PN} += "gmp"
+
+FILES_${PN} += "${datadir}/*"
diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular_1.2.1.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular_1.2.1.1.bb
deleted file mode 100644
index 9305a84..0000000
--- a/meta-openstack/recipes-devtools/python/python-xstatic-angular_1.2.1.1.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Angular JavaScript library packaged for setuptools"
-HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=7e6bb42b0e414f5151db54e18332cd10"
-
-PR = "r0"
-
-SRCNAME = "XStatic-Angular"
-SRC_URI = "http://pypi.python.org/packages/source/X/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "062f1590769f9afef17110a637a29461"
-SRC_URI[sha256sum] = "8ee63c5fbb3c4dad16f09c5467f1e71229a5e8b63d2993e761d81cdf86f72bae"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
-
-# DEPENDS_default: python-pip
-
-DEPENDS += " \
-        python-pip \
-        "
-
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
-        "
diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular_1.3.7.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular_1.3.7.0.bb
new file mode 100644
index 0000000..39e5e6c
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-xstatic-angular_1.3.7.0.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Angular JavaScript library packaged for setuptools"
+HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=fef10afacf31c10c1fb9ce04e3763269"
+
+PR = "r0"
+
+SRCNAME = "XStatic-Angular"
+SRC_URI = "http://pypi.python.org/packages/source/X/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "fa26884ab0b2acfa09e372aedd7e7b04"
+SRC_URI[sha256sum] = "7cad216b226399cbe8d2909ed5b9f28d724907b9c9e1e078e6e25d320a3d5dd7"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
+
+# DEPENDS_default: python-pip
+
+DEPENDS += " \
+        python-pip \
+        "
+
+# RDEPENDS_default: 
+RDEPENDS_${PN} += " \
+        "
-- 
cgit v1.2.3-54-g00ecf