commit 52371f37d216622882dc0b3e51870a9a09319ad0
Author: Pádraig Brady <P(a)draigBrady.com>
Date: Thu May 31 23:42:11 2012 +0100
fix removal of python-django-nose dependency
The previous commit 169b5a2, neglected to remove
the references to python-django-nose in settings.py,
so include a patch to do that.
python-django-horizon-disable-nose.patch | 18 ++++++++++++++++++
python-django-horizon.spec | 2 ++
2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/python-django-horizon-disable-nose.patch b/python-django-horizon-disable-nose.patch
new file mode 100644
index 0000000..95051cd
--- /dev/null
+++ b/python-django-horizon-disable-nose.patch
@@ -0,0 +1,18 @@
+diff -Naur horizon-2012.1.orig/openstack_dashboard/settings.py horizon-2012.1/openstack_dashboard/settings.py
+--- horizon-2012.1.orig/openstack_dashboard/settings.py 2012-04-04 02:13:35.000000000 +0000
++++ horizon-2012.1/openstack_dashboard/settings.py 2012-05-31 22:40:08.268637001 +0000
+@@ -94,14 +94,12 @@
+ 'django.contrib.sessions',
+ 'django.contrib.messages',
+ 'django.contrib.staticfiles',
+- 'django_nose',
+ 'horizon',
+ 'horizon.dashboards.nova',
+ 'horizon.dashboards.syspanel',
+ 'horizon.dashboards.settings',
+ )
+
+-TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
+ AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',)
+ MESSAGE_STORAGE = 'django.contrib.messages.storage.cookie.CookieStorage'
+
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 856a2b2..6182eb8 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -26,6 +26,7 @@ Patch1: %{name}-disable-debug.patch
Patch2: %{name}-default-db.patch
Patch3: xss-in-log-viewer.patch
Patch4: CVE-2012-2144-session_fixation.patch
+Patch5: %{name}-disable-nose.patch
Requires: Django >= 1.3.0
Requires: openstack-glance >= 2012.1
@@ -90,6 +91,7 @@ Documentation for the Django Horizon application for talking with Openstack
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
%{__python} setup.py build