[python-django-horizon] Final update to Grizzly release 2013.1
Matthias Runge
mrunge at fedoraproject.org
Fri Apr 5 08:55:29 UTC 2013
commit 9301f2bb4cf6933dd7f41029fd642d155d31a058
Author: Matthias Runge <mrunge at redhat.com>
Date: Fri Apr 5 10:17:44 2013 +0200
Final update to Grizzly release 2013.1
.gitignore | 4 +++
...patch => 0001-disable-debug-move-web-root.patch | 28 ++++++++++++-------
...-Don-t-access-the-net-while-building-docs.patch | 8 +++---
0003-take-variables-out-of-compressed-output.patch | 26 ------------------
...-set-mount-point-as-it-s-unsupported-here.patch | 27 -------------------
python-django-horizon.spec | 8 +----
sources | 5 +++-
7 files changed, 32 insertions(+), 74 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e57b50f..90c1571 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,7 @@
/horizon-2013.1~g1.tar.gz
/horizon-2013.1~g2.tar.gz
/horizon-2013.1.g3.tar.gz
+/horizon-2013.1.tar.gz
+/openstack-dashboard.conf
+/openstack-dashboard-httpd-2.4.conf
+/openstack-dashboard-httpd-logging.conf
diff --git a/0001-disable-debug.patch b/0001-disable-debug-move-web-root.patch
similarity index 75%
rename from 0001-disable-debug.patch
rename to 0001-disable-debug-move-web-root.patch
index fa5d206..964e52d 100644
--- a/0001-disable-debug.patch
+++ b/0001-disable-debug-move-web-root.patch
@@ -1,16 +1,15 @@
-From 8cf09673312cf401c89e01f7293b2332a9dc33f2 Mon Sep 17 00:00:00 2001
+From 89c1473e29ba768299b59e1fecadac247f9e6614 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
- /dashboard - enable offline compression
+Date: Fri, 5 Apr 2013 10:07:53 +0200
+Subject: [PATCH] disable debug, move web root
---
- openstack_dashboard/local/local_settings.py.example | 2 +-
+ openstack_dashboard/local/local_settings.py.example | 4 ++--
openstack_dashboard/settings.py | 12 +++++++-----
- 2 files changed, 8 insertions(+), 6 deletions(-)
+ 2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index b85fa80..6ee1988 100644
+index 8f79020..d6d6d7a 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 _
@@ -22,8 +21,17 @@ index b85fa80..6ee1988 100644
TEMPLATE_DEBUG = DEBUG
# Set SSL proxy settings:
+@@ -116,7 +116,7 @@ OPENSTACK_KEYSTONE_BACKEND = {
+ }
+
+ OPENSTACK_HYPERVISOR_FEATURES = {
+- 'can_set_mount_point': True,
++ 'can_set_mount_point': False,
+
+ # NOTE: as of Grizzly this is not yet supported in Nova so enabling this
+ # setting will not do anything useful
diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index da89944..9e7cec9 100644
+index d568533..bbe2870 100644
--- a/openstack_dashboard/settings.py
+++ b/openstack_dashboard/settings.py
@@ -29,7 +29,7 @@ warnings.formatwarning = lambda message, category, *args, **kwargs: \
@@ -52,7 +60,7 @@ index da89944..9e7cec9 100644
MEDIA_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'media'))
MEDIA_URL = '/media/'
-@@ -108,7 +109,7 @@ STATICFILES_FINDERS = (
+@@ -113,7 +114,7 @@ STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
)
@@ -61,7 +69,7 @@ index da89944..9e7cec9 100644
COMPRESS_PRECOMPILERS = (
('text/less', (less_binary + ' {infile} {outfile}')),
)
-@@ -121,6 +122,7 @@ COMPRESS_ENABLED = True
+@@ -126,6 +127,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 5f4dde0..fd1e43b 100644
--- a/0002-Don-t-access-the-net-while-building-docs.patch
+++ b/0002-Don-t-access-the-net-while-building-docs.patch
@@ -1,9 +1,9 @@
-From 9ec313da0a17efe80ac38f8a037ff967da2aaac0 Mon Sep 17 00:00:00 2001
+From c6accfed876324f56a84ddd1e80e48a1420dc45d 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
+Date: Fri, 5 Apr 2013 10:16:19 +0200
+Subject: [PATCH] Don't access the net while building docs (Note this hasn't
+ been submitted upstream)
-(Note this hasn't been submitted upstream)
---
doc/source/conf.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 6bdcf46..1c614b5 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-3/+download/horizon-%{version}.g3.tar.gz
+Source0: https://launchpad.net/horizon/grizzly/%{version}/+download/horizon-%{version}.tar.gz
Source1: openstack-dashboard.conf
Source2: openstack-dashboard-httpd-2.4.conf
@@ -18,10 +18,8 @@ Source4: openstack-dashboard-httpd-logging.conf
#
# patches_base=2013.1
#
-Patch0001: 0001-disable-debug.patch
+Patch0001: 0001-disable-debug-move-web-root.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
@@ -125,8 +123,6 @@ 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 '{}' \;
diff --git a/sources b/sources
index ca39f73..d1bcb8e 100644
--- a/sources
+++ b/sources
@@ -1 +1,4 @@
-67145eedcf4e608a8186ac88b9325ffc horizon-2013.1.g3.tar.gz
+6655e4eae4312b6e5348d185d0b854aa horizon-2013.1.tar.gz
+8847ac562ae1ba9508fc63e488d1d789 openstack-dashboard.conf
+1f8635eac7872529d7b6577424d3355c openstack-dashboard-httpd-2.4.conf
+87f3bb8bd46fea5e638791eccd7760a9 openstack-dashboard-httpd-logging.conf
More information about the scm-commits
mailing list