[python-django-horizon] Rebase to 2014.1.b1
Matthias Runge
mrunge at fedoraproject.org
Thu Dec 12 07:37:15 UTC 2013
commit ac7ef0a7c6f5bc4f6029ea2ad075adf2a074f327
Author: Matthias Runge <mrunge at redhat.com>
Date: Fri Dec 6 11:33:17 2013 +0100
Rebase to 2014.1.b1
...-Don-t-access-the-net-while-building-docs.patch | 6 +-
0002-disable-debug-move-web-root.patch | 18 +-
...file-location-to-tmp-and-also-add-localho.patch | 4 +-
...-Add-a-customization-module-based-on-RHOS.patch | 4 +-
...oslo.sphinx-and-remove-local-copy-of-doc-.patch | 1348 --------------------
...olicy-files-and-checks-to-etc-openstack-d.patch | 6 +-
...6-move-SECRET_KEY-secret_key_store-to-tmp.patch | 4 +-
... => 0007-fix-up-issues-with-customization.patch | 2 +-
...not-truncate-the-logo-related-rhbz-877138.patch | 2 +-
...T_KEYSTORE-to-var-lib-openstack-dashboard.patch | 4 +-
...escaping-strings-from-Nova-before-display.patch | 76 --
python-django-horizon.spec | 24 +-
12 files changed, 34 insertions(+), 1464 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 230c43c..244161c 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 5aa18b349bc82432d0a55a0a0de1cab75f1f0256 Mon Sep 17 00:00:00 2001
+From 36cebb4f9ddbf7f0a879de58161002ff18b7c32f 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,10 +9,10 @@ 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 2c84fb3..30e4b6d 100644
+index e912ce7..0289fe7 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
-@@ -141,7 +141,6 @@ write_autodoc_index()
+@@ -139,7 +139,6 @@ write_autodoc_index()
# They can be extensions coming with Sphinx (named 'sphinx.ext.*')
# or your custom ones.
extensions = ['sphinx.ext.autodoc',
diff --git a/0002-disable-debug-move-web-root.patch b/0002-disable-debug-move-web-root.patch
index 73649e0..50d01b7 100644
--- a/0002-disable-debug-move-web-root.patch
+++ b/0002-disable-debug-move-web-root.patch
@@ -1,15 +1,15 @@
-From ca2e5852377a438a997bdb5c7da2489e2a312b5a Mon Sep 17 00:00:00 2001
+From e240d5e635fac790288eacd0b29e674d43538abd 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
---
- openstack_dashboard/local/local_settings.py.example | 8 ++++++--
+ openstack_dashboard/local/local_settings.py.example | 6 +++++-
openstack_dashboard/settings.py | 10 ++++++----
- 2 files changed, 12 insertions(+), 6 deletions(-)
+ 2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index 6e426c9..d2db3cd 100644
+index 3f7d8bf..ee582e5 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 _
@@ -21,12 +21,10 @@ index 6e426c9..d2db3cd 100644
TEMPLATE_DEBUG = DEBUG
# Required for Django 1.5.
-@@ -150,7 +150,11 @@ OPENSTACK_KEYSTONE_BACKEND = {
- }
-
+@@ -156,6 +156,10 @@ OPENSTACK_KEYSTONE_BACKEND = {
OPENSTACK_HYPERVISOR_FEATURES = {
-- 'can_set_mount_point': True,
-+ 'can_set_mount_point': False,
+ 'can_set_mount_point': False,
+ 'can_set_password': True,
+
+ # NOTE: as of Grizzly this is not yet supported in Nova so enabling this
+ # setting will not do anything useful
@@ -35,7 +33,7 @@ index 6e426c9..d2db3cd 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 852a895..84da859 100644
+index 1216099..09a5ec3 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 7538b75..6328534 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 c767b5ecbde0729499dab5ea6cce842ebf221403 Mon Sep 17 00:00:00 2001
+From fb66a51ba9bf9f08e7089e1c5f6b2000af45c49b 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 d2db3cd..d386d46 100644
+index ee582e5..2468173 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 ba1f9e3..7c8ca1c 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 a589f3805381cabca1a3b66dddc1717483191c7e Mon Sep 17 00:00:00 2001
+From 55bca5c70bf0c45ed691802fbdde595072e1a1a2 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 84da859..cc40815 100644
+index 09a5ec3..20edb90 100644
--- a/openstack_dashboard/settings.py
+++ b/openstack_dashboard/settings.py
@@ -119,14 +119,13 @@ TEMPLATE_CONTEXT_PROCESSORS = (
diff --git a/0006-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch b/0005-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
similarity index 89%
rename from 0006-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
rename to 0005-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
index 967cfb6..7331404 100644
--- a/0006-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,4 +1,4 @@
-From bd493f10d0387e9209f6b5bb155d18287af49901 Mon Sep 17 00:00:00 2001
+From cd06a934c974b269370832b754336a29e330b416 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 d386d46..afa95f1 100644
+index 2468173..bea1d85 100644
--- a/openstack_dashboard/local/local_settings.py.example
+++ b/openstack_dashboard/local/local_settings.py.example
-@@ -228,12 +228,13 @@ TIME_ZONE = "UTC"
+@@ -233,12 +233,13 @@ TIME_ZONE = "UTC"
# target installation.
# Path to directory containing policy.json files
diff --git a/0007-move-SECRET_KEY-secret_key_store-to-tmp.patch b/0006-move-SECRET_KEY-secret_key_store-to-tmp.patch
similarity index 92%
rename from 0007-move-SECRET_KEY-secret_key_store-to-tmp.patch
rename to 0006-move-SECRET_KEY-secret_key_store-to-tmp.patch
index 100fd00..e7ed5c9 100644
--- a/0007-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 948386ba19d517ed7db5d687c6df0040bf0a1eb4 Mon Sep 17 00:00:00 2001
+From 0e0217a30b4b4ea4e468f3a390f57ede7cefeb61 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 afa95f1..d120dfc 100644
+index bea1d85..56e1fce 100644
--- a/openstack_dashboard/local/local_settings.py.example
+++ b/openstack_dashboard/local/local_settings.py.example
@@ -77,7 +77,6 @@ HORIZON_CONFIG = {
diff --git a/0008-fix-up-issues-with-customization.patch b/0007-fix-up-issues-with-customization.patch
similarity index 98%
rename from 0008-fix-up-issues-with-customization.patch
rename to 0007-fix-up-issues-with-customization.patch
index 70880fb..ec09c69 100644
--- a/0008-fix-up-issues-with-customization.patch
+++ b/0007-fix-up-issues-with-customization.patch
@@ -1,4 +1,4 @@
-From 7901d2b031e4aaa83850b72d84f91e3f718e20cf Mon Sep 17 00:00:00 2001
+From 45108668834a442b8e6b6ae7194f91959bd1f5ef 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
diff --git a/0009-do-not-truncate-the-logo-related-rhbz-877138.patch b/0008-do-not-truncate-the-logo-related-rhbz-877138.patch
similarity index 93%
rename from 0009-do-not-truncate-the-logo-related-rhbz-877138.patch
rename to 0008-do-not-truncate-the-logo-related-rhbz-877138.patch
index d93447d..d865559 100644
--- a/0009-do-not-truncate-the-logo-related-rhbz-877138.patch
+++ b/0008-do-not-truncate-the-logo-related-rhbz-877138.patch
@@ -1,4 +1,4 @@
-From e3014c15ec43eebe4b699ceccfd25f6e3c31e42a Mon Sep 17 00:00:00 2001
+From e796f196d00cd5d8ca1258df54f52bcd16e413f1 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)
diff --git a/0010-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch b/0009-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
similarity index 90%
rename from 0010-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
rename to 0009-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
index 51910c5..0a4b48a 100644
--- a/0010-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
+++ b/0009-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
@@ -1,4 +1,4 @@
-From 3ce878cdd3b0b5a8cd66399acd4524bcdf6ac9f9 Mon Sep 17 00:00:00 2001
+From faa691bae79aaeae0d62e7c9d100774809024ca9 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'
@@ -8,7 +8,7 @@ Subject: [PATCH] move SECRET_KEYSTORE to '/var/lib/openstack-dashboard'
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 d120dfc..a60ad0c 100644
+index 56e1fce..33b9556 100644
--- a/openstack_dashboard/local/local_settings.py.example
+++ b/openstack_dashboard/local/local_settings.py.example
@@ -88,7 +88,7 @@ HORIZON_CONFIG = {
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 48cc213..59bc6f1 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -26,13 +26,11 @@ 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-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
-Patch0011: 0011-Fix-bug-by-escaping-strings-from-Nova-before-display.patch
+Patch0005: 0005-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
+Patch0006: 0006-move-SECRET_KEY-secret_key_store-to-tmp.patch
+Patch0007: 0007-fix-up-issues-with-customization.patch
+Patch0008: 0008-do-not-truncate-the-logo-related-rhbz-877138.patch
+Patch0009: 0009-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
@@ -89,7 +87,7 @@ Group: Applications/System
Requires: httpd
Requires: mod_wsgi
Requires: python-django-horizon >= %{version}
-Requires: python-django-openstack-auth >= 1.0.11
+Requires: python-django-openstack-auth >= 1.1.3
Requires: python-django-compressor >= 1.3
Requires: python-django-appconf
Requires: python-glanceclient
@@ -100,13 +98,13 @@ Requires: python-cinderclient >= 1.0.6
Requires: python-swiftclient
Requires: python-heatclient
Requires: python-ceilometerclient
-Requires: python-troveclient
+Requires: python-troveclient >= 1.0.0
Requires: python-netaddr
Requires: python-oslo-config
Requires: python-eventlet
BuildRequires: python2-devel
-BuildRequires: python-django-openstack-auth >= 1.0.11
+BuildRequires: python-django-openstack-auth >= 1.1.3
BuildRequires: python-django-compressor >= 1.3
BuildRequires: python-django-appconf
BuildRequires: python-lesscpy
@@ -141,7 +139,7 @@ BuildRequires: python-cinderclient
BuildRequires: python-swiftclient
BuildRequires: python-heatclient
BuildRequires: python-ceilometerclient
-BuildRequires: python-troveclient
+BuildRequires: python-troveclient >= 1.0.0
%description doc
Documentation for the Django Horizon application for talking with Openstack
@@ -154,7 +152,7 @@ Requires: openstack-dashboard = %{version}
Customization module for OpenStack Dashboard to provide a branded logo.
%prep
-%setup -q -n horizon-%{version}
+%setup -q -n horizon-%{version}.b1
%patch0001 -p1
%patch0002 -p1
@@ -165,8 +163,6 @@ Customization module for OpenStack Dashboard to provide a branded logo.
%patch0007 -p1
%patch0008 -p1
%patch0009 -p1
-%patch0010 -p1
-%patch0011 -p1
# remove unnecessary .po files
find . -name "django*.po" -exec rm -f '{}' \;
More information about the scm-commits
mailing list