[python-django-horizon/f20] Updated patches from f20-patches

[Matthias Runge]

commit f16a1927c79f2b64fadb480a4d134c069b9e3020
Author: Matthias Runge <mrunge at redhat.com>
Date:   Thu Jun 12 11:26:10 2014 +0200

    Updated patches from f20-patches

 0008-work-on-parallel-installable-django.patch |   46 ++++++++++++++++++++++++
 python-django-horizon.spec                     |    1 +
 2 files changed, 47 insertions(+), 0 deletions(-)
---
diff --git a/0008-work-on-parallel-installable-django.patch b/0008-work-on-parallel-installable-django.patch
new file mode 100644
index 0000000..e7111bb
--- /dev/null
+++ b/0008-work-on-parallel-installable-django.patch
@@ -0,0 +1,46 @@
+From 112f6ef55c15c69f88bb4dfbbd608ff00fba4a57 Mon Sep 17 00:00:00 2001
+From: Matthias Runge <mrunge at redhat.com>
+Date: Thu, 12 Jun 2014 11:25:48 +0200
+Subject: [PATCH] work on parallel installable django
+
+---
+ manage.py                            | 7 +++++++
+ openstack_dashboard/wsgi/django.wsgi | 7 +++++++
+ 2 files changed, 14 insertions(+)
+
+diff --git a/manage.py b/manage.py
+index fe16377..eca9769 100755
+--- a/manage.py
++++ b/manage.py
+@@ -3,6 +3,13 @@
+ import os
+ import sys
+ 
++
++####
++# explicitly require Django 1.5 or later
++from pkg_resources import require
++require('Django>=1.5,<1.6')
++####
++
+ from django.core.management import execute_from_command_line  # noqa
+ 
+ if __name__ == "__main__":
+diff --git a/openstack_dashboard/wsgi/django.wsgi b/openstack_dashboard/wsgi/django.wsgi
+index 1e92a4d..42430f7 100644
+--- a/openstack_dashboard/wsgi/django.wsgi
++++ b/openstack_dashboard/wsgi/django.wsgi
+@@ -1,6 +1,13 @@
+ import logging
+ import os
+ import sys
++
++####
++# explicitly require Django 1.5 or later
++from pkg_resources import require
++require('Django>=1.5,<1.6')
++####
++
+ import django.core.handlers.wsgi
+ from django.conf import settings
+ 
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 24fa473..da8a588 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -28,6 +28,7 @@ Patch0004: 0004-Add-a-customization-module-based-on-RHOS.patch
 Patch0005: 0005-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
 Patch0006: 0006-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
 Patch0007: 0007-Introduces-escaping-in-Horizon-Orchestration.patch
+Patch0008: 0008-work-on-parallel-installable-django.patch
 
 
 BuildArch:  noarch