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

[Matthias Runge]

commit c83335461909d9d3fd905dc9940df478cb0cb2b4
Author: Matthias Runge <mrunge at redhat.com>
Date:   Thu Jan 17 11:37:35 2013 +0100

    Updated patches from master-patches

 0001-disable-debug.patch                           |    4 +-
 ...-Don-t-access-the-net-while-building-docs.patch |    2 +-
 0003-take-variables-out-of-compressed-output.patch |    2 +-
 ...-set-mount-point-as-it-s-unsupported-here.patch |   22 ++++++++++++++++++++
 python-django-horizon.spec                         |    2 +
 5 files changed, 28 insertions(+), 4 deletions(-)
---
diff --git a/0001-disable-debug.patch b/0001-disable-debug.patch
index 1fb0715..4bfc5ed 100644
--- a/0001-disable-debug.patch
+++ b/0001-disable-debug.patch
@@ -1,4 +1,4 @@
-From 861c7dd0e53de6a72a1cdb1cdcef802d35f2c927 Mon Sep 17 00:00:00 2001
+From 1035c29e1187fbae31d13d3bb75b35173a509307 Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge at redhat.com>
 Date: Tue, 27 Nov 2012 14:08:00 +0100
 Subject: [PATCH] - disable debug - make url movable (currently moved to
@@ -10,7 +10,7 @@ Subject: [PATCH] - disable debug - make url movable (currently moved to
  2 files changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index e9918cd..2ca2de5 100644
+index c622915..930d19a 100644
 --- a/openstack_dashboard/local/local_settings.py.example
 +++ b/openstack_dashboard/local/local_settings.py.example
 @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
diff --git a/0002-Don-t-access-the-net-while-building-docs.patch b/0002-Don-t-access-the-net-while-building-docs.patch
index 6b77381..11843d7 100644
--- a/0002-Don-t-access-the-net-while-building-docs.patch
+++ b/0002-Don-t-access-the-net-while-building-docs.patch
@@ -1,4 +1,4 @@
-From 0a6c500edfe5d0aaa64d5522cc34b177b7a1fe33 Mon Sep 17 00:00:00 2001
+From b18c264e6276586c34d5dfd9d49f96a762bfc75b Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge at redhat.com>
 Date: Wed, 28 Nov 2012 11:37:48 +0100
 Subject: [PATCH] Don't access the net while building docs
diff --git a/0003-take-variables-out-of-compressed-output.patch b/0003-take-variables-out-of-compressed-output.patch
index d8c8059..572c5fc 100644
--- a/0003-take-variables-out-of-compressed-output.patch
+++ b/0003-take-variables-out-of-compressed-output.patch
@@ -1,4 +1,4 @@
-From 9883666206b74742d001463a606fac702edbe9d5 Mon Sep 17 00:00:00 2001
+From ad45e1a7341df1522eee32fc6264e8b936caea37 Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge at redhat.com>
 Date: Thu, 29 Nov 2012 11:14:29 +0100
 Subject: [PATCH] take variables out of compressed output
diff --git a/0004-disable-to-set-mount-point-as-it-s-unsupported-here.patch b/0004-disable-to-set-mount-point-as-it-s-unsupported-here.patch
new file mode 100644
index 0000000..ee249b5
--- /dev/null
+++ b/0004-disable-to-set-mount-point-as-it-s-unsupported-here.patch
@@ -0,0 +1,22 @@
+From 00b180b664e6ae9e456b270db218f62415b1a362 Mon Sep 17 00:00:00 2001
+From: Matthias Runge <mrunge at redhat.com>
+Date: Thu, 17 Jan 2013 10:06:25 +0100
+Subject: [PATCH] disable to set mount point, as it's unsupported here
+
+---
+ openstack_dashboard/local/local_settings.py.example | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
+index 930d19a..ce9d4e4 100644
+--- a/openstack_dashboard/local/local_settings.py.example
++++ b/openstack_dashboard/local/local_settings.py.example
+@@ -91,7 +91,7 @@ OPENSTACK_KEYSTONE_BACKEND = {
+ }
+ 
+ OPENSTACK_HYPERVISOR_FEATURES = {
+-    'can_set_mount_point': True
++    'can_set_mount_point': False
+ }
+ 
+ # OPENSTACK_ENDPOINT_TYPE specifies the endpoint type to use for the endpoints
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index e2f25c3..2e23c73 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -24,6 +24,7 @@ Source4:    openstack-dashboard-httpd-logging.conf
 Patch0001: 0001-disable-debug.patch
 Patch0002: 0002-Don-t-access-the-net-while-building-docs.patch
 Patch0003: 0003-take-variables-out-of-compressed-output.patch
+Patch0004: 0004-disable-to-set-mount-point-as-it-s-unsupported-here.patch
 
 
 %if 0%{?rhel}<7 || 0%{?fedora} < 18
@@ -118,6 +119,7 @@ Documentation for the Django Horizon application for talking with Openstack
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
+%patch0004 -p1
 # remove unnecessary .po files
 find . -name "django*.po" -exec rm -f '{}' \;