[python-django-horizon] Updated patches from master-patches

[Matthias Runge]

commit 4623748ccd1c8fe44bc3151538917fba36819c61
Author: Matthias Runge <mrunge at redhat.com>
Date:   Fri Dec 6 12:36:01 2013 +0100

    Updated patches from master-patches

 ...T_KEYSTORE-to-var-lib-openstack-dashboard.patch |   27 ++++++++++++++++++-
 python-django-horizon.spec                         |    3 +-
 2 files changed, 27 insertions(+), 3 deletions(-)
---
diff --git a/0009-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch b/0009-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
index 0a4b48a..4525e28 100644
--- a/0009-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
+++ b/0009-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
@@ -1,11 +1,12 @@
-From faa691bae79aaeae0d62e7c9d100774809024ca9 Mon Sep 17 00:00:00 2001
+From 4e9b72b29921eab8a7a4ea9554f07936818d8996 Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge at redhat.com>
 Date: Fri, 4 Oct 2013 09:46:36 +0200
 Subject: [PATCH] move SECRET_KEYSTORE to '/var/lib/openstack-dashboard'
 
 ---
  openstack_dashboard/local/local_settings.py.example | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ openstack_dashboard/settings.py                     | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
 index 56e1fce..33b9556 100644
@@ -20,3 +21,25 @@ index 56e1fce..33b9556 100644
  SECRET_KEY = secret_key.generate_or_read_from_file(os.path.join(LOCAL_PATH, '.secret_key_store'))
  
  # We recommend you use memcached for development; otherwise after every reload
+diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
+index 20edb90..08bffb5 100644
+--- a/openstack_dashboard/settings.py
++++ b/openstack_dashboard/settings.py
+@@ -125,7 +125,7 @@ TEMPLATE_LOADERS = (
+ 
+ TEMPLATE_DIRS = (
+     os.path.join(ROOT_PATH, 'templates'),
+-) 
++)
+ 
+ STATICFILES_FINDERS = (
+     'compressor.finders.CompressorFinder',
+@@ -168,7 +168,7 @@ THEME_APP = 'openstack_dashboard_theme'
+ try:
+     __import__(THEME_APP)
+     INSTALLED_APPS = (THEME_APP,) + INSTALLED_APPS
+-except:
++except Exception:
+     pass
+ 
+ 
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 59bc6f1..d6a494d 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -140,6 +140,7 @@ BuildRequires: python-swiftclient
 BuildRequires: python-heatclient
 BuildRequires: python-ceilometerclient
 BuildRequires: python-troveclient >= 1.0.0
+BuildRequires: python-oslo-sphinx
 
 %description doc
 Documentation for the Django Horizon application for talking with Openstack
@@ -271,7 +272,7 @@ mkdir -p %{buildroot}%{_var}/log/horizon
 
 %check
 sed -i 's:^SECRET_KEY =.*:SECRET_KEY = "badcafe":' openstack_dashboard/local/local_settings.py
-./run_tests.sh -N
+./run_tests.sh -N -P
 
 %files -f horizon.lang
 %doc LICENSE README.rst openstack-dashboard-httpd-logging.conf