[python-django-horizon/f20] Updated patches from f20-patches
Matthias Runge
mrunge at fedoraproject.org
Thu Oct 17 08:12:19 UTC 2013
commit d7bdfcc2351f53d8c1c6e465d8b18966d28e65e1
Author: Matthias Runge <mrunge at redhat.com>
Date: Thu Oct 17 09:24:46 2013 +0200
Updated patches from f20-patches
...-Don-t-access-the-net-while-building-docs.patch | 2 +-
0002-disable-debug-move-web-root.patch | 2 +-
...file-location-to-tmp-and-also-add-localho.patch | 2 +-
...-Add-a-customization-module-based-on-RHOS.patch | 2 +-
...oslo.sphinx-and-remove-local-copy-of-doc-.patch | 2 +-
...olicy-files-and-checks-to-etc-openstack-d.patch | 2 +-
0007-move-SECRET_KEY-secret_key_store-to-tmp.patch | 2 +-
0008-fix-up-issues-with-customization.patch | 2 +-
...not-truncate-the-logo-related-rhbz-877138.patch | 2 +-
...T_KEYSTORE-to-var-lib-openstack-dashboard.patch | 2 +-
python-django-horizon.spec | 4 ++--
11 files changed, 12 insertions(+), 12 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..a31e028 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 82bd61e0d9e3121507abf9acc51f5739e5bce22e 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 73649e0..253efec 100644
--- a/0002-disable-debug-move-web-root.patch
+++ b/0002-disable-debug-move-web-root.patch
@@ -1,4 +1,4 @@
-From ca2e5852377a438a997bdb5c7da2489e2a312b5a Mon Sep 17 00:00:00 2001
+From 9fbf589a1f2c3b1bb58566eac8963847a12f5b9f 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
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..7c4aaaa 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 1ee6b707c9be851daf1e823b65926501e2438ac5 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
diff --git a/0004-Add-a-customization-module-based-on-RHOS.patch b/0004-Add-a-customization-module-based-on-RHOS.patch
index ba1f9e3..e512b93 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 739b10c814b688bbf79f648b63ac1c23d029d692 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
diff --git a/0005-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch b/0005-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
index 0057127..9e17c01 100644
--- a/0005-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 d2be0ab6922c1133de4a5c98d9711745c5d6cecb Mon Sep 17 00:00:00 2001
+From 558cb56d4924b61e1b5d59be0a01c0c2196e475d 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"
diff --git a/0006-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch b/0006-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
index 967cfb6..52c95f1 100644
--- a/0006-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 bd493f10d0387e9209f6b5bb155d18287af49901 Mon Sep 17 00:00:00 2001
+From 2691af274619bba80b69d9b82dc361b4753d9988 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
diff --git a/0007-move-SECRET_KEY-secret_key_store-to-tmp.patch b/0007-move-SECRET_KEY-secret_key_store-to-tmp.patch
index 100fd00..b17e09d 100644
--- a/0007-move-SECRET_KEY-secret_key_store-to-tmp.patch
+++ b/0007-move-SECRET_KEY-secret_key_store-to-tmp.patch
@@ -1,4 +1,4 @@
-From 948386ba19d517ed7db5d687c6df0040bf0a1eb4 Mon Sep 17 00:00:00 2001
+From a9e19f40c6e110f0a4096bb35727d6234bbe5059 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
diff --git a/0008-fix-up-issues-with-customization.patch b/0008-fix-up-issues-with-customization.patch
index 70880fb..133f23a 100644
--- a/0008-fix-up-issues-with-customization.patch
+++ b/0008-fix-up-issues-with-customization.patch
@@ -1,4 +1,4 @@
-From 7901d2b031e4aaa83850b72d84f91e3f718e20cf Mon Sep 17 00:00:00 2001
+From 5f76f2ac05c527e4ac0fb1efff93b7bf339aeb6b 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/0009-do-not-truncate-the-logo-related-rhbz-877138.patch
index d93447d..c5ff820 100644
--- a/0009-do-not-truncate-the-logo-related-rhbz-877138.patch
+++ b/0009-do-not-truncate-the-logo-related-rhbz-877138.patch
@@ -1,4 +1,4 @@
-From e3014c15ec43eebe4b699ceccfd25f6e3c31e42a Mon Sep 17 00:00:00 2001
+From 2359369ccfc585806600fd4b34127d514715853e 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/0010-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
index 51910c5..49ccacb 100644
--- a/0010-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
+++ b/0010-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
@@ -1,4 +1,4 @@
-From 3ce878cdd3b0b5a8cd66399acd4524bcdf6ac9f9 Mon Sep 17 00:00:00 2001
+From 8d6d4842c2eb7b50a1df290465790d8975f5c056 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'
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 2164bd2..0cb1ed1 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -110,7 +110,7 @@ BuildRequires: python-django-appconf
BuildRequires: python-lesscpy
BuildRequires: python-oslo-config
-BuildRequires: pytz
+BuildRequires: pytz
%description -n openstack-dashboard
Openstack Dashboard is a web user interface for Openstack. The package
provides a reference implementation using the Django Horizon project,
@@ -152,7 +152,7 @@ Requires: openstack-dashboard = %{version}
Customization module for OpenStack Dashboard to provide a branded logo.
%prep
-%setup -q -n horizon-%{version}.rc2
+%setup -q -n horizon-%{version}.rc3
%patch0001 -p1
%patch0002 -p1
More information about the scm-commits
mailing list