[python-django-horizon] Updated patches from master-patches
Matthias Runge
mrunge at fedoraproject.org
Wed Feb 27 09:44:05 UTC 2013
commit c33a5106085429c93ed926af8a628d80415789cc
Author: Matthias Runge <mrunge at redhat.com>
Date: Wed Feb 27 10:35:48 2013 +0100
Updated patches from master-patches
0001-disable-debug.patch | 10 +++++-----
...-Don-t-access-the-net-while-building-docs.patch | 4 ++--
0003-take-variables-out-of-compressed-output.patch | 2 +-
...-set-mount-point-as-it-s-unsupported-here.patch | 16 ++++++++++------
python-django-horizon.spec | 4 ++--
5 files changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/0001-disable-debug.patch b/0001-disable-debug.patch
index 4bfc5ed..fa5d206 100644
--- a/0001-disable-debug.patch
+++ b/0001-disable-debug.patch
@@ -1,4 +1,4 @@
-From 1035c29e1187fbae31d13d3bb75b35173a509307 Mon Sep 17 00:00:00 2001
+From 8cf09673312cf401c89e01f7293b2332a9dc33f2 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 c622915..930d19a 100644
+index b85fa80..6ee1988 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 _
@@ -23,7 +23,7 @@ index c622915..930d19a 100644
# Set SSL proxy settings:
diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index 790187c..95a78fb 100644
+index da89944..9e7cec9 100644
--- a/openstack_dashboard/settings.py
+++ b/openstack_dashboard/settings.py
@@ -29,7 +29,7 @@ warnings.formatwarning = lambda message, category, *args, **kwargs: \
@@ -52,7 +52,7 @@ index 790187c..95a78fb 100644
MEDIA_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'media'))
MEDIA_URL = '/media/'
-@@ -102,7 +103,7 @@ STATICFILES_FINDERS = (
+@@ -108,7 +109,7 @@ STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
)
@@ -61,7 +61,7 @@ index 790187c..95a78fb 100644
COMPRESS_PRECOMPILERS = (
('text/less', (less_binary + ' {infile} {outfile}')),
)
-@@ -115,6 +116,7 @@ COMPRESS_ENABLED = True
+@@ -121,6 +122,7 @@ COMPRESS_ENABLED = True
COMPRESS_OUTPUT_DIR = 'dashboard'
COMPRESS_CSS_HASHING_METHOD = 'hash'
COMPRESS_PARSER = 'compressor.parser.HtmlParser'
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 11843d7..5f4dde0 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 b18c264e6276586c34d5dfd9d49f96a762bfc75b Mon Sep 17 00:00:00 2001
+From 9ec313da0a17efe80ac38f8a037ff967da2aaac0 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Don't access the net while building docs
1 file changed, 1 deletion(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 37b8813..e754d5c 100644
+index 561b440..beaaef4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -141,7 +141,6 @@ write_autodoc_index()
diff --git a/0003-take-variables-out-of-compressed-output.patch b/0003-take-variables-out-of-compressed-output.patch
index 572c5fc..8003ace 100644
--- a/0003-take-variables-out-of-compressed-output.patch
+++ b/0003-take-variables-out-of-compressed-output.patch
@@ -1,4 +1,4 @@
-From ad45e1a7341df1522eee32fc6264e8b936caea37 Mon Sep 17 00:00:00 2001
+From 75baecee3b897505492e28f005042247790dc756 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
index ee249b5..c0106d0 100644
--- 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
@@ -1,21 +1,25 @@
-From 00b180b664e6ae9e456b270db218f62415b1a362 Mon Sep 17 00:00:00 2001
+From d691a94942328f6924077f985f4290f93a9a7bb6 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(-)
+ openstack_dashboard/local/local_settings.py.example | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index 930d19a..ce9d4e4 100644
+index 6ee1988..268d65d 100644
--- a/openstack_dashboard/local/local_settings.py.example
+++ b/openstack_dashboard/local/local_settings.py.example
-@@ -91,7 +91,7 @@ OPENSTACK_KEYSTONE_BACKEND = {
+@@ -97,11 +97,10 @@ OPENSTACK_KEYSTONE_BACKEND = {
}
OPENSTACK_HYPERVISOR_FEATURES = {
-- 'can_set_mount_point': True
+- 'can_set_mount_point': True,
+-
+ # NOTE: as of Grizzly this is not yet supported in Nova so enabling this
+ # setting will not do anything useful
+ 'can_encrypt_volumes': False
+ 'can_set_mount_point': False
}
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 5b5f95b..ccf8ab4 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -8,7 +8,7 @@ Group: Development/Libraries
License: ASL 2.0 and BSD
URL: http://horizon.openstack.org/
BuildArch: noarch
-Source0: https://launchpad.net/horizon/grizzly/grizzly-2/+download/horizon-%{version}~g2.tar.gz
+Source0: https://launchpad.net/horizon/grizzly/grizzly-3/+download/horizon-%{version}.g3.tar.gz
Source1: openstack-dashboard.conf
Source2: openstack-dashboard-httpd-2.4.conf
@@ -121,7 +121,7 @@ Documentation for the Django Horizon application for talking with Openstack
%prep
-%setup -q -n horizon-%{version}
+%setup -q -n horizon-%{version}.g3
%patch0001 -p1
%patch0002 -p1
More information about the scm-commits
mailing list