[python-django-horizon] Add relevant patches on top of RC1 (havana rc1 rebase)
Matthias Runge
mrunge at fedoraproject.org
Fri Oct 4 09:10:23 UTC 2013
commit a451461aeec3acfbcff3a05ba70b96715e85a524
Author: Matthias Runge <mrunge at redhat.com>
Date: Fri Oct 4 09:47:19 2013 +0200
Add relevant patches on top of RC1 (havana rc1 rebase)
set SECRET_KEY to a defined value during build, to avoid issues due file creation etc.
...-Don-t-access-the-net-while-building-docs.patch | 4 +-
0002-disable-debug-move-web-root.patch | 14 +-
...file-location-to-tmp-and-also-add-localho.patch | 4 +-
...-Add-a-customization-module-based-on-RHOS.patch | 8 +-
0005-Revert-Adding-panels-for-trove.patch | 2375 --------------------
...oslo.sphinx-and-remove-local-copy-of-doc-.patch | 6 +-
...olicy-files-and-checks-to-etc-openstack-d.patch | 10 +-
0007-move-SECRET_KEY-secret_key_store-to-tmp.patch | 29 +
0008-fix-up-issues-with-customization.patch | 81 +
0008-move-SECRET_KEY-secret_key_store-to-tmp.patch | 43 -
...not-truncate-the-logo-related-rhbz-877138.patch | 26 +
...T_KEYSTORE-to-var-lib-openstack-dashboard.patch | 22 +
python-django-horizon.spec | 25 +-
13 files changed, 198 insertions(+), 2449 deletions(-)
---
diff --git a/0001-Don-t-access-the-net-while-building-docs.patch b/0001-Don-t-access-the-net-while-building-docs.patch
index 5863678..7a09af5 100644
--- a/0001-Don-t-access-the-net-while-building-docs.patch
+++ b/0001-Don-t-access-the-net-while-building-docs.patch
@@ -1,4 +1,4 @@
-From e843606f059684957482b85db841b2623eddeda2 Mon Sep 17 00:00:00 2001
+From a993b31582bd052a92b96a8ed50dd1bbcce05053 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Fri, 5 Apr 2013 10:16:19 +0200
Subject: [PATCH] Don't access the net while building docs (Note this hasn't
@@ -9,7 +9,7 @@ Subject: [PATCH] Don't access the net while building docs (Note this hasn't
1 file changed, 1 deletion(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index b708972..0a7f677 100644
+index 2c84fb3..30e4b6d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -141,7 +141,6 @@ write_autodoc_index()
diff --git a/0002-disable-debug-move-web-root.patch b/0002-disable-debug-move-web-root.patch
index 0c4cbd0..d4dd489 100644
--- a/0002-disable-debug-move-web-root.patch
+++ b/0002-disable-debug-move-web-root.patch
@@ -1,4 +1,4 @@
-From c1ad47c868f41c4e7f2a8c94b02242741c487534 Mon Sep 17 00:00:00 2001
+From 3cc31a7ab2e7ffd89680f4b7472dd492fc54fa2d Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Fri, 5 Apr 2013 10:07:53 +0200
Subject: [PATCH] disable debug, move web root
@@ -9,7 +9,7 @@ Subject: [PATCH] disable debug, move web root
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index 9c3f714..fa4bb18 100644
+index 6d333e2..11b02d6 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 _
@@ -35,11 +35,11 @@ index 9c3f714..fa4bb18 100644
# The OPENSTACK_NEUTRON_NETWORK settings can be used to enable optional
diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index 378917b..9d1ee84 100644
+index 1216099..09a5ec3 100644
--- a/openstack_dashboard/settings.py
+++ b/openstack_dashboard/settings.py
-@@ -29,7 +29,7 @@ warnings.formatwarning = lambda message, category, *args, **kwargs: \
- '%s: %s' % (category.__name__, message)
+@@ -31,7 +31,7 @@ warnings.formatwarning = lambda message, category, *args, **kwargs: \
+ '%s: %s' % (category.__name__, message)
ROOT_PATH = os.path.dirname(os.path.abspath(__file__))
-BIN_DIR = os.path.abspath(os.path.join(ROOT_PATH, '..', 'bin'))
@@ -47,7 +47,7 @@ index 378917b..9d1ee84 100644
if ROOT_PATH not in sys.path:
sys.path.append(ROOT_PATH)
-@@ -47,12 +47,13 @@ SECRET_KEY = secret_key.generate_or_read_from_file(os.path.join(LOCAL_PATH,
+@@ -41,12 +41,13 @@ TEMPLATE_DEBUG = DEBUG
SITE_BRANDING = 'OpenStack Dashboard'
@@ -64,7 +64,7 @@ index 378917b..9d1ee84 100644
MEDIA_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'media'))
MEDIA_URL = '/media/'
-@@ -132,6 +133,7 @@ COMPRESS_ENABLED = True
+@@ -144,6 +145,7 @@ COMPRESS_ENABLED = True
COMPRESS_OUTPUT_DIR = 'dashboard'
COMPRESS_CSS_HASHING_METHOD = 'hash'
COMPRESS_PARSER = 'compressor.parser.HtmlParser'
diff --git a/0003-change-lockfile-location-to-tmp-and-also-add-localho.patch b/0003-change-lockfile-location-to-tmp-and-also-add-localho.patch
index b85326f..0a2c277 100644
--- a/0003-change-lockfile-location-to-tmp-and-also-add-localho.patch
+++ b/0003-change-lockfile-location-to-tmp-and-also-add-localho.patch
@@ -1,4 +1,4 @@
-From 8d98fac2f2de942662822b495c1d8b36761c8603 Mon Sep 17 00:00:00 2001
+From bece01fd2bb6c3844b369b977b4af67f29352235 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Thu, 25 Jul 2013 11:32:38 +0200
Subject: [PATCH] change lockfile location to '/tmp' and also add localhost to
@@ -9,7 +9,7 @@ Subject: [PATCH] change lockfile location to '/tmp' and also add localhost to
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index fa4bb18..9e4675c 100644
+index 11b02d6..cbf3d9b 100644
--- a/openstack_dashboard/local/local_settings.py.example
+++ b/openstack_dashboard/local/local_settings.py.example
@@ -12,7 +12,7 @@ TEMPLATE_DEBUG = DEBUG
diff --git a/0004-Add-a-customization-module-based-on-RHOS.patch b/0004-Add-a-customization-module-based-on-RHOS.patch
index faa0188..c33266c 100644
--- a/0004-Add-a-customization-module-based-on-RHOS.patch
+++ b/0004-Add-a-customization-module-based-on-RHOS.patch
@@ -1,4 +1,4 @@
-From cdbb878b1c43671873e21836dd8ba65e8a9a4750 Mon Sep 17 00:00:00 2001
+From a08b8f8fd6e4c86d918e2053b5bd181abb3d0e87 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Thu, 14 Feb 2013 12:55:54 +0100
Subject: [PATCH] Add a customization module based on RHOS
@@ -28,10 +28,10 @@ Conflicts:
create mode 100644 openstack_dashboard_theme/templates/splash.html
diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index 9d1ee84..7bad6f8 100644
+index 09a5ec3..20edb90 100644
--- a/openstack_dashboard/settings.py
+++ b/openstack_dashboard/settings.py
-@@ -107,14 +107,13 @@ TEMPLATE_CONTEXT_PROCESSORS = (
+@@ -119,14 +119,13 @@ TEMPLATE_CONTEXT_PROCESSORS = (
)
TEMPLATE_LOADERS = (
@@ -47,7 +47,7 @@ index 9d1ee84..7bad6f8 100644
STATICFILES_FINDERS = (
'compressor.finders.CompressorFinder',
-@@ -152,6 +151,15 @@ INSTALLED_APPS = (
+@@ -164,6 +163,15 @@ INSTALLED_APPS = (
'openstack_dashboard.dashboards.router',
)
diff --git a/0006-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch b/0005-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
similarity index 99%
rename from 0006-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
rename to 0005-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
index fcbe766..1726977 100644
--- a/0006-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
+++ b/0005-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
@@ -1,4 +1,4 @@
-From 597dc95e0455195a7e97b3432472531f1498c0ca Mon Sep 17 00:00:00 2001
+From 3681cec52e0a20183ec22ac69bb8abcbf41dee06 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Mon, 9 Sep 2013 13:51:19 +0200
Subject: [PATCH] Revert "Use oslo.sphinx and remove local copy of doc theme"
@@ -1305,7 +1305,7 @@ index 0000000..1cc4004
+stylesheet = nature.css
+pygments_style = tango
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 0a7f677..adb3d14 100644
+index 30e4b6d..ec9e63f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -144,12 +144,13 @@ extensions = ['sphinx.ext.autodoc',
@@ -1338,7 +1338,7 @@ index 0a7f677..adb3d14 100644
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
diff --git a/test-requirements.txt b/test-requirements.txt
-index e634373..727d09e 100644
+index 6f771b2..3ddb8a0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,4 +14,3 @@ selenium
diff --git a/0007-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch b/0006-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
similarity index 78%
rename from 0007-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
rename to 0006-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
index 0ab0c0d..c3e7f55 100644
--- a/0007-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
+++ b/0006-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
@@ -1,4 +1,4 @@
-From 76e15a3cd419a0038b44687effec95b41e656d79 Mon Sep 17 00:00:00 2001
+From 5a2c2139a821c865f8b9de9501453ddd33d27b4b Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Mon, 9 Sep 2013 14:13:07 +0200
Subject: [PATCH] move RBAC policy files and checks to /etc/openstack-dashboard
@@ -8,10 +8,10 @@ Subject: [PATCH] move RBAC policy files and checks to /etc/openstack-dashboard
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index 0e8cc55..d0f0ad4 100644
+index cbf3d9b..e899a1e 100644
--- a/openstack_dashboard/local/local_settings.py.example
+++ b/openstack_dashboard/local/local_settings.py.example
-@@ -227,12 +227,13 @@ TIME_ZONE = "UTC"
+@@ -228,12 +228,13 @@ TIME_ZONE = "UTC"
# target installation.
# Path to directory containing policy.json files
@@ -28,5 +28,5 @@ index 0e8cc55..d0f0ad4 100644
+ 'compute': 'nova_policy.json'
+}
- LOGGING = {
- 'version': 1,
+ # Trove user and database extension support. By default support for
+ # creating users and databases on database instances is turned on.
diff --git a/0007-move-SECRET_KEY-secret_key_store-to-tmp.patch b/0007-move-SECRET_KEY-secret_key_store-to-tmp.patch
new file mode 100644
index 0000000..f2b929d
--- /dev/null
+++ b/0007-move-SECRET_KEY-secret_key_store-to-tmp.patch
@@ -0,0 +1,29 @@
+From c2e14bdee9684c3c9ee8ba1bb6be0a580c4af904 Mon Sep 17 00:00:00 2001
+From: Matthias Runge <mrunge at redhat.com>
+Date: Mon, 9 Sep 2013 20:52:51 +0200
+Subject: [PATCH] move SECRET_KEY secret_key_store to /tmp
+
+---
+ 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 e899a1e..7334be0 100644
+--- a/openstack_dashboard/local/local_settings.py.example
++++ b/openstack_dashboard/local/local_settings.py.example
+@@ -77,7 +77,6 @@ HORIZON_CONFIG = {
+ # Turn off browser autocompletion for the login form if so desired.
+ # HORIZON_CONFIG["password_autocomplete"] = "off"
+
+-LOCAL_PATH = '/tmp'
+
+ # Set custom secret key:
+ # You can either set it to a specific value or you can let horizion generate a
+@@ -89,6 +88,7 @@ LOCAL_PATH = '/tmp'
+ # requests routed to the same dashboard instance or you set the same SECRET_KEY
+ # for all of them.
+ from horizon.utils import secret_key
++LOCAL_PATH = '/tmp'
+ 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/0008-fix-up-issues-with-customization.patch b/0008-fix-up-issues-with-customization.patch
new file mode 100644
index 0000000..74cabd7
--- /dev/null
+++ b/0008-fix-up-issues-with-customization.patch
@@ -0,0 +1,81 @@
+From c82f4ea6134d579ca3b7b3c6ebea81d1a15f870e Mon Sep 17 00:00:00 2001
+From: Matthias Runge <mrunge at redhat.com>
+Date: Thu, 19 Sep 2013 12:58:00 +0200
+Subject: [PATCH] fix up issues with customization
+
+---
+ openstack_dashboard_theme/__init__.py | 1 +
+ openstack_dashboard_theme/models.py | 1 +
+ .../static/dashboard/less/rhtheme.less | 2 +-
+ .../templates/horizon/common/_sidebar.html | 23 ++++++++++++++++++++--
+ 4 files changed, 24 insertions(+), 3 deletions(-)
+
+diff --git a/openstack_dashboard_theme/__init__.py b/openstack_dashboard_theme/__init__.py
+index e69de29..94456ab 100644
+--- a/openstack_dashboard_theme/__init__.py
++++ b/openstack_dashboard_theme/__init__.py
+@@ -0,0 +1 @@
++# intentionally left blank
+diff --git a/openstack_dashboard_theme/models.py b/openstack_dashboard_theme/models.py
+index e69de29..94456ab 100644
+--- a/openstack_dashboard_theme/models.py
++++ b/openstack_dashboard_theme/models.py
+@@ -0,0 +1 @@
++# intentionally left blank
+diff --git a/openstack_dashboard_theme/static/dashboard/less/rhtheme.less b/openstack_dashboard_theme/static/dashboard/less/rhtheme.less
+index 5350db3..2d8b2d0 100644
+--- a/openstack_dashboard_theme/static/dashboard/less/rhtheme.less
++++ b/openstack_dashboard_theme/static/dashboard/less/rhtheme.less
+@@ -1,4 +1,4 @@
+- at import "/static/dashboard/less/horizon.less";
++ at import "horizon.less";
+
+ /* Login Splash Page */
+
+diff --git a/openstack_dashboard_theme/templates/horizon/common/_sidebar.html b/openstack_dashboard_theme/templates/horizon/common/_sidebar.html
+index 5672846..df66c62 100644
+--- a/openstack_dashboard_theme/templates/horizon/common/_sidebar.html
++++ b/openstack_dashboard_theme/templates/horizon/common/_sidebar.html
+@@ -1,7 +1,8 @@
+ {% load branding horizon i18n %}
++{% load url from future %}
+
+ <div class='sidebar'>
+- <h1 class="rhos clearfix"><a href="{% url horizon:user_home %}">{% site_branding %}</a></h1>
++ <h1 class="rhos clearfix"><a href="{% url 'horizon:user_home' %}">{% site_branding %}</a></h1>
+
+ {% horizon_main_nav %}
+
+@@ -22,7 +23,7 @@
+ <li class='divider'></li>
+ {% for tenant in authorized_tenants %}
+ {% if tenant.enabled and tenant.id != request.user.tenant_id %}
+- <li><a href="{% url switch_tenants tenant.id %}">{{ tenant.name }}</a></li>
++ <li><a href="{% url 'switch_tenants' tenant.id %}?next={{ request.horizon.dashboard.get_absolute_url }}">{{ tenant.name }}</a></li>
+ {% endif %}
+ {% endfor %}
+ </ul>
+@@ -31,5 +32,23 @@
+ </div>
+ {% endif %}
+
++ {% with num_of_regions=request.user.available_services_regions|length %}
++ {% if num_of_regions > 1 %}
++ <div id="services_region_switcher" class="dropdown switcher_bar" tabindex="1">
++ <a class="dropdown-toggle" data-toggle="dropdown" href="#services_region_switcher">
++ <h4>{% trans "Managing Region" %}</h4>
++ <h3>{{ request.user.services_region }}</h3>
++ </a>
++
++ <ul id="services_regions_list" class="dropdown-menu">
++ <li class='divider'></li>
++ {% for region in request.user.available_services_regions %}
++ <li><a href="{% url 'switch_services_region' region %}?next={{ request.horizon.panel.get_absolute_url }}">{{ region }}</a></li>
++ {% endfor %}
++ </ul>
++ </div>
++ {% endif %}
++ {% endwith %}
++
+ {% horizon_dashboard_nav %}
+ </div>
diff --git a/0009-do-not-truncate-the-logo-related-rhbz-877138.patch b/0009-do-not-truncate-the-logo-related-rhbz-877138.patch
new file mode 100644
index 0000000..2bbcf57
--- /dev/null
+++ b/0009-do-not-truncate-the-logo-related-rhbz-877138.patch
@@ -0,0 +1,26 @@
+From eb46f4b4265fded3d5908d34de2ccef1892edde1 Mon Sep 17 00:00:00 2001
+From: Matthias Runge <mrunge at redhat.com>
+Date: Thu, 19 Sep 2013 13:58:16 +0200
+Subject: [PATCH] do not truncate the logo (related rhbz 877138)
+
+---
+ openstack_dashboard_theme/static/dashboard/less/rhtheme.less | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/openstack_dashboard_theme/static/dashboard/less/rhtheme.less b/openstack_dashboard_theme/static/dashboard/less/rhtheme.less
+index 2d8b2d0..d70852e 100644
+--- a/openstack_dashboard_theme/static/dashboard/less/rhtheme.less
++++ b/openstack_dashboard_theme/static/dashboard/less/rhtheme.less
+@@ -46,10 +46,10 @@ h1.rhos a {
+ background: url(/static/dashboard/img/rh-logo.png) top left no-repeat;
+ display: block;
+ float: left;
+- width: 116px;
++ width: 123px;
+ height: 123px;
+ text-indent: -9999px;
+- margin-left: 56px;
++ margin-left: 53px;
+ margin-top: 15px;
+ margin-bottom: 25px;
+ }
diff --git a/0010-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch b/0010-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
new file mode 100644
index 0000000..c67894b
--- /dev/null
+++ b/0010-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
@@ -0,0 +1,22 @@
+From dea4dfb6ba5d47a758cdbe93315a95922f9be0bf 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(-)
+
+diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
+index 7334be0..8284633 100644
+--- a/openstack_dashboard/local/local_settings.py.example
++++ b/openstack_dashboard/local/local_settings.py.example
+@@ -88,7 +88,7 @@ HORIZON_CONFIG = {
+ # requests routed to the same dashboard instance or you set the same SECRET_KEY
+ # for all of them.
+ from horizon.utils import secret_key
+-LOCAL_PATH = '/tmp'
++LOCAL_PATH = '/var/lib/openstack-dashboard'
+ 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/python-django-horizon.spec b/python-django-horizon.spec
index 21e2b9d..811ee6d 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/havana/havana-3/+download/horizon-%{version}.b3.tar.gz
+Source0: https://launchpad.net/horizon/havana/havana-rc1/+download/horizon-%{version}.rc1.tar.gz
Source1: openstack-dashboard.conf
Source2: openstack-dashboard-httpd-2.4.conf
@@ -26,10 +26,12 @@ Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
Patch0002: 0002-disable-debug-move-web-root.patch
Patch0003: 0003-change-lockfile-location-to-tmp-and-also-add-localho.patch
Patch0004: 0004-Add-a-customization-module-based-on-RHOS.patch
-Patch0005: 0005-Revert-Adding-panels-for-trove.patch
-Patch0006: 0006-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
-Patch0007: 0007-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
-Patch0008: 0008-move-SECRET_KEY-secret_key_store-to-tmp.patch
+Patch0005: 0005-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
+Patch0006: 0006-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
+Patch0007: 0007-move-SECRET_KEY-secret_key_store-to-tmp.patch
+Patch0008: 0008-fix-up-issues-with-customization.patch
+Patch0009: 0009-do-not-truncate-the-logo-related-rhbz-877138.patch
+Patch0010: 0010-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
@@ -150,7 +152,7 @@ Requires: openstack-dashboard = %{version}
Customization module for OpenStack Dashboard to provide a branded logo.
%prep
-%setup -q -n horizon-%{version}.b3
+%setup -q -n horizon-%{version}.rc1
%patch0001 -p1
%patch0002 -p1
@@ -160,6 +162,8 @@ Customization module for OpenStack Dashboard to provide a branded logo.
%patch0006 -p1
%patch0007 -p1
%patch0008 -p1
+%patch0009 -p1
+%patch0010 -p1
# remove unnecessary .po files
find . -name "django*.po" -exec rm -f '{}' \;
@@ -181,9 +185,10 @@ cp -p %{SOURCE4} .
# compress css, js etc.
cp openstack_dashboard/local/local_settings.py.example openstack_dashboard/local/local_settings.py
+# dirty hack to make SECRET_KEY work:
+sed -i 's:^SECRET_KEY =.*:ECRET_KEY = "badcafe":' openstack_dashboard/local/local_settings.py
%{__python} manage.py collectstatic --noinput
%{__python} manage.py compress
-
cp -a static/dashboard %{_buildir}
# build docs
@@ -194,6 +199,9 @@ sphinx-1.0-build -b html doc/source html
sphinx-build -b html doc/source html
%endif
+# undo hack
+cp openstack_dashboard/local/local_settings.py.example openstack_dashboard/local/local_settings.py
+
# Fix hidden-file-or-dir warnings
rm -fr html/.doctrees html/.buildinfo
@@ -258,6 +266,7 @@ cp -a static/* %{buildroot}%{_datadir}/openstack-dashboard/static
# create /var/run/openstack-dashboard/ and own it
mkdir -p %{buildroot}%{_sharedstatedir}/openstack-dashboard
%check
+sed -i 's:^SECRET_KEY =.*:ECRET_KEY = "badcafe":' openstack_dashboard/local/local_settings.py
./run_tests.sh -N
%files -f horizon.lang
@@ -314,7 +323,7 @@ mkdir -p %{buildroot}%{_sharedstatedir}/openstack-dashboard
%{_datadir}/openstack-dashboard/openstack_dashboard_theme
%changelog
-* Fru Oct 04 2013 Matthias Runge <mrunge at redhat.com> - 2013.2-0.12.rc1
+* Fri Oct 04 2013 Matthias Runge <mrunge at redhat.com> - 2013.2-0.12.rc1
- update to Havana-rc1
- move secret_keystone to /var/lib/openstack-dashboard
More information about the scm-commits
mailing list