[python-django-horizon/f21] rebase to 2014.1.2
Alan Pevec
apevec at fedoraproject.org
Mon Aug 11 23:27:45 UTC 2014
commit 769daebc8229ef1b6941a7385518e0edb49ab1e4
Author: Alan Pevec <alan.pevec at redhat.com>
Date: Tue Aug 12 01:13:39 2014 +0200
rebase to 2014.1.2
.gitignore | 1 +
...-Don-t-access-the-net-while-building-docs.patch | 2 +-
0002-disable-debug-move-web-root.patch | 6 ++--
...file-location-to-tmp-and-also-add-localho.patch | 4 +-
...-Add-a-customization-module-based-on-RHOS.patch | 4 +-
...olicy-files-and-checks-to-etc-openstack-d.patch | 23 +++++------------
0006-move-SECRET_KEY-secret_key_store-to-tmp.patch | 4 +-
0007-RCUE-navbar-and-login-screen.patch | 4 +-
...a-hook-for-redhat-openstack-access-plugin.patch | 2 +-
0009-fix-flake8-issues.patch | 2 +-
...ing-comma-in-Volume-ResourceWrapper-class.patch | 26 --------------------
... => 0010-remove-runtime-dep-to-python-pbr.patch | 2 +-
...dd-Change-password-link-to-the-RCUE-theme.patch | 26 ++++++++++++++++++++
0012-Re-enable-offline-compression.patch | 22 ++++++++++++++++
python-django-horizon.spec | 16 +++++++----
sources | 2 +-
16 files changed, 82 insertions(+), 64 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e58ae61..1260758 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
/horizon-2014.1.rc1.tar.gz
/horizon-2014.1.rc2.tar.gz
/horizon-2014.1.tar.gz
+/horizon-2014.1.2.tar.gz
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 d18e75a..dee5a3c 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 e39662d2f83241cd932564c1b98050719e5aec42 Mon Sep 17 00:00:00 2001
+From fd8e322ab767a0497a6fe2e12879f61226eb82c6 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
diff --git a/0002-disable-debug-move-web-root.patch b/0002-disable-debug-move-web-root.patch
index 2c02d77..2dbc397 100644
--- a/0002-disable-debug-move-web-root.patch
+++ b/0002-disable-debug-move-web-root.patch
@@ -1,4 +1,4 @@
-From 44397a61fe6a377c397c7c213893d0ca513f6989 Mon Sep 17 00:00:00 2001
+From f26ce7c449791c304b304bcdd6beb06ff97db4c2 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, 7 insertions(+), 5 deletions(-)
diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index 74f7bf8..169fd93 100644
+index 20b56c3..96d2cde 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,7 +22,7 @@ index 74f7bf8..169fd93 100644
# Required for Django 1.5.
diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index f253e0f..2fee751 100644
+index 79f7b22..74dfa1e 100644
--- a/openstack_dashboard/settings.py
+++ b/openstack_dashboard/settings.py
@@ -31,7 +31,7 @@ warnings.formatwarning = lambda message, category, *args, **kwargs: \
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 30931bd..af1f77c 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 78929835d2471f5bd4137ef284a23b16ed3be326 Mon Sep 17 00:00:00 2001
+From 24c8df7c47062eeac03a2e26a33844b5a52852f6 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 169fd93..61cf4b1 100644
+index 96d2cde..d0fd2a7 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 9df2d5d..3efe2cd 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 29d7f508e57cb04342709b11a471d62cf29e1152 Mon Sep 17 00:00:00 2001
+From 1df18bddd4e6919ecb324775921bba6094a326f0 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,7 +28,7 @@ Conflicts:
create mode 100644 openstack_dashboard_theme/templates/splash.html
diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index 2fee751..92d1e7d 100644
+index 74dfa1e..782cc53 100644
--- a/openstack_dashboard/settings.py
+++ b/openstack_dashboard/settings.py
@@ -119,14 +119,13 @@ TEMPLATE_CONTEXT_PROCESSORS = (
diff --git a/0005-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch b/0005-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
index 34616c6..e5dce49 100644
--- a/0005-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
+++ b/0005-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
@@ -1,17 +1,17 @@
-From 7676c2e8ffeeb2495d0fc6908d509aba5dc3dccb Mon Sep 17 00:00:00 2001
+From 69b99ad8f1df4ce51557c5c1a4cbe582716e0c10 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
---
- openstack_dashboard/local/local_settings.py.example | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
+ openstack_dashboard/local/local_settings.py.example | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index 61cf4b1..8306143 100644
+index d0fd2a7..a7a3bad 100644
--- a/openstack_dashboard/local/local_settings.py.example
+++ b/openstack_dashboard/local/local_settings.py.example
-@@ -248,12 +248,13 @@ TIME_ZONE = "UTC"
+@@ -248,7 +248,8 @@ TIME_ZONE = "UTC"
# target installation.
# Path to directory containing policy.json files
@@ -19,14 +19,5 @@ index 61cf4b1..8306143 100644
+# POLICY_FILES_PATH = os.path.join(ROOT_PATH, "conf")
+POLICY_FILES_PATH = '/etc/openstack-dashboard'
# Map of local copy of service policy files
--#POLICY_FILES = {
--# 'identity': 'keystone_policy.json',
--# 'compute': 'nova_policy.json'
--#}
-+POLICY_FILES = {
-+ 'identity': 'keystone_policy.json',
-+ 'compute': 'nova_policy.json'
-+}
-
- # Trove user and database extension support. By default support for
- # creating users and databases on database instances is turned on.
+ #POLICY_FILES = {
+ # 'identity': 'keystone_policy.json',
diff --git a/0006-move-SECRET_KEY-secret_key_store-to-tmp.patch b/0006-move-SECRET_KEY-secret_key_store-to-tmp.patch
index 824265a..abafbd0 100644
--- a/0006-move-SECRET_KEY-secret_key_store-to-tmp.patch
+++ b/0006-move-SECRET_KEY-secret_key_store-to-tmp.patch
@@ -1,4 +1,4 @@
-From c2671a4e21f4d64425ef4371a71a88e1d2d7c061 Mon Sep 17 00:00:00 2001
+From 5986dd1e598729c9b9197d3a18ec6eb81697c3fb 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
@@ -8,7 +8,7 @@ Subject: [PATCH] move SECRET_KEY secret_key_store to /tmp
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 8306143..51897c1 100644
+index a7a3bad..7eca94e 100644
--- a/openstack_dashboard/local/local_settings.py.example
+++ b/openstack_dashboard/local/local_settings.py.example
@@ -78,7 +78,6 @@ HORIZON_CONFIG = {
diff --git a/0007-RCUE-navbar-and-login-screen.patch b/0007-RCUE-navbar-and-login-screen.patch
index dd7b67d..8a57069 100644
--- a/0007-RCUE-navbar-and-login-screen.patch
+++ b/0007-RCUE-navbar-and-login-screen.patch
@@ -1,4 +1,4 @@
-From 6cb0e324b2e4d6ebacd7f1c02a8123f959aedc7b Mon Sep 17 00:00:00 2001
+From b8cfb48da490f0d69869b4ac2cc6b39c801c9235 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Fri, 7 Mar 2014 09:48:30 +0100
Subject: [PATCH] RCUE navbar and login screen
@@ -19087,7 +19087,7 @@ index 0000000..f37f848
+ADD_INSTALLED_APPS = ['openstack_dashboard.dashboards.theme']
+
diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index 92d1e7d..01e3308 100644
+index 782cc53..da95217 100644
--- a/openstack_dashboard/settings.py
+++ b/openstack_dashboard/settings.py
@@ -125,13 +125,15 @@ TEMPLATE_LOADERS = (
diff --git a/0008-Added-a-hook-for-redhat-openstack-access-plugin.patch b/0008-Added-a-hook-for-redhat-openstack-access-plugin.patch
index 0e30f70..8fa6187 100644
--- a/0008-Added-a-hook-for-redhat-openstack-access-plugin.patch
+++ b/0008-Added-a-hook-for-redhat-openstack-access-plugin.patch
@@ -1,4 +1,4 @@
-From ab07cce8556d0d74feb0b9b1f278d89947fd8c7d Mon Sep 17 00:00:00 2001
+From d301845635106868be289dd6dae933ff5b8f14a8 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Mon, 31 Mar 2014 09:22:28 +0200
Subject: [PATCH] Added a hook for redhat openstack access plugin
diff --git a/0009-fix-flake8-issues.patch b/0009-fix-flake8-issues.patch
index 5af9846..b5633bb 100644
--- a/0009-fix-flake8-issues.patch
+++ b/0009-fix-flake8-issues.patch
@@ -1,4 +1,4 @@
-From bc27c5bd19141a2fd4a5cdacff8a459b995788c5 Mon Sep 17 00:00:00 2001
+From 91f908fff851bb928333d8509ab8e2bbac0a10e1 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Thu, 10 Apr 2014 09:27:21 +0200
Subject: [PATCH] fix flake8 issues
diff --git a/0011-remove-runtime-dep-to-python-pbr.patch b/0010-remove-runtime-dep-to-python-pbr.patch
similarity index 93%
rename from 0011-remove-runtime-dep-to-python-pbr.patch
rename to 0010-remove-runtime-dep-to-python-pbr.patch
index 4c6df46..26189e0 100644
--- a/0011-remove-runtime-dep-to-python-pbr.patch
+++ b/0010-remove-runtime-dep-to-python-pbr.patch
@@ -1,4 +1,4 @@
-From baac5ad38aab070602dcb02b6d3154783ac8b5bc Mon Sep 17 00:00:00 2001
+From 005ba7f5b31b766bb1885eef9e3a8da38147567f Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Fri, 15 Nov 2013 09:42:08 +0100
Subject: [PATCH] remove runtime dep to python-pbr
diff --git a/0011-Add-Change-password-link-to-the-RCUE-theme.patch b/0011-Add-Change-password-link-to-the-RCUE-theme.patch
new file mode 100644
index 0000000..6657638
--- /dev/null
+++ b/0011-Add-Change-password-link-to-the-RCUE-theme.patch
@@ -0,0 +1,26 @@
+From f4f3e4b8980cdc0cfa3ce31c51f76c428a27dd55 Mon Sep 17 00:00:00 2001
+From: Julie Pichon <jpichon at redhat.com>
+Date: Tue, 20 May 2014 16:22:31 +0100
+Subject: [PATCH] Add "Change password" link to the RCUE theme.
+
+Resolves rhbz: 1099076
+
+Change-Id: I2f3df72c40464a4478177a566c5cf8f2660e52e2
+---
+ openstack_dashboard/dashboards/theme/templates/_header.html | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/openstack_dashboard/dashboards/theme/templates/_header.html b/openstack_dashboard/dashboards/theme/templates/_header.html
+index 8ce279e..479adfb 100644
+--- a/openstack_dashboard/dashboards/theme/templates/_header.html
++++ b/openstack_dashboard/dashboards/theme/templates/_header.html
+@@ -20,7 +20,8 @@
+ <li class="dropdown {% if request.horizon.dashboard.slug == "settings" %}active{% endif %}">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="rcueicon rcueicon-user"></span> {% blocktrans with username=request.user.username %}{{ username }}{% endblocktrans %}<b class="caret"></b></a>
+ <ul class="dropdown-menu">
+- <li{% if request.horizon.dashboard.slug == "settings" %} class="active"{% endif %}><a href="{% url 'horizon:settings:user:index' %}">{% trans "Settings" %}</a></li>
++ <li{% if request.horizon.dashboard.slug == "settings" and request.horizon.panel.slug == "user" %} class="active"{% endif %}><a href="{% url 'horizon:settings:user:index' %}">{% trans "Settings" %}</a></li>
++ <li{% if request.horizon.dashboard.slug == "settings" and request.horizon.panel.slug == "password" %} class="active"{% endif %}><a href="{% url 'horizon:settings:password:index' %}">{% trans "Change Password" %}</a></li>
+ <li class="divider"></li>
+ <li><a href="{% url 'logout' %}">{% trans "Sign Out" %}</a></li>
+ </ul>
diff --git a/0012-Re-enable-offline-compression.patch b/0012-Re-enable-offline-compression.patch
new file mode 100644
index 0000000..213a80c
--- /dev/null
+++ b/0012-Re-enable-offline-compression.patch
@@ -0,0 +1,22 @@
+From c4fe1d4e9715dd77ef10567de9617ffb65847c46 Mon Sep 17 00:00:00 2001
+From: Matthias Runge <mrunge at redhat.com>
+Date: Tue, 17 Jun 2014 09:04:42 +0200
+Subject: [PATCH] Re-enable offline compression
+
+---
+ openstack_dashboard/settings.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
+index da95217..de23c45 100644
+--- a/openstack_dashboard/settings.py
++++ b/openstack_dashboard/settings.py
+@@ -146,7 +146,7 @@ COMPRESS_ENABLED = True
+ COMPRESS_OUTPUT_DIR = 'dashboard'
+ COMPRESS_CSS_HASHING_METHOD = 'hash'
+ COMPRESS_PARSER = 'compressor.parser.HtmlParser'
+-COMPRESS_OFFLINE = False
++COMPRESS_OFFLINE = True
+
+ INSTALLED_APPS = [
+ 'openstack_dashboard',
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 292d96a..1fa97be 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -1,14 +1,14 @@
%global with_compression 1
Name: python-django-horizon
-Version: 2014.1
-Release: 5%{?dist}
+Version: 2014.1.2
+Release: 1%{?dist}
Summary: Django application for talking to Openstack
Group: Development/Libraries
# Code in horizon/horizon/utils taken from django which is BSD
License: ASL 2.0 and BSD
URL: http://horizon.openstack.org/
-Source0: https://launchpad.net/horizon/icehouse/icehouse/+download/horizon-%{version}.tar.gz
+Source0: https://launchpad.net/horizon/icehouse/%{version}/+download/horizon-%{version}.tar.gz
Source1: openstack-dashboard.conf
Source2: openstack-dashboard-httpd-2.4.conf
@@ -16,7 +16,7 @@ Source2: openstack-dashboard-httpd-2.4.conf
Source4: openstack-dashboard-httpd-logging.conf
#
-# patches_base=2014.1
+# patches_base=2014.1.2
#
Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
Patch0002: 0002-disable-debug-move-web-root.patch
@@ -27,8 +27,9 @@ Patch0006: 0006-move-SECRET_KEY-secret_key_store-to-tmp.patch
Patch0007: 0007-RCUE-navbar-and-login-screen.patch
Patch0008: 0008-Added-a-hook-for-redhat-openstack-access-plugin.patch
Patch0009: 0009-fix-flake8-issues.patch
-Patch0010: 0010-Add-missing-comma-in-Volume-ResourceWrapper-class.patch
-Patch0011: 0011-remove-runtime-dep-to-python-pbr.patch
+Patch0010: 0010-remove-runtime-dep-to-python-pbr.patch
+Patch0011: 0011-Add-Change-password-link-to-the-RCUE-theme.patch
+Patch0012: 0012-Re-enable-offline-compression.patch
@@ -372,6 +373,9 @@ sed -i 's:^SECRET_KEY =.*:SECRET_KEY = "badcafe":' openstack_dashboard/local/loc
%{_datadir}/openstack-dashboard/openstack_dashboard/enabled/_99_customization.*
%changelog
+* Tue Aug 12 2014 Alan Pevec <apevec at redhat.com> - 2014.1.2-1
+- rebase to 2014.1.2
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2014.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 38da50f..5d3fa7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e3ed8556c5d5689108d6a8f432af1118 horizon-2014.1.tar.gz
+b65d1d8f10fb4bc6461c1d93b3b201ec horizon-2014.1.2.tar.gz
More information about the scm-commits
mailing list