[python-django-horizon/el6-icehouse] Updated patches from el6-icehouse-patches
Matthias Runge
mrunge at fedoraproject.org
Tue Jul 1 06:38:58 UTC 2014
commit 3d809417958907fef34c2151142f2775c4dfd033
Author: Matthias Runge <mrunge at redhat.com>
Date: Tue Jun 17 08:42:51 2014 +0200
Updated patches from el6-icehouse-patches
... => 0010-remove-runtime-dep-to-python-pbr.patch | 2 +-
...dd-Change-password-link-to-the-RCUE-theme.patch | 2 +-
python-django-horizon.spec | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
---
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 4b98198..bdaf569 100644
--- a/0011-remove-runtime-dep-to-python-pbr.patch
+++ b/0010-remove-runtime-dep-to-python-pbr.patch
@@ -1,4 +1,4 @@
-From 890cedc9640f7fcd3977c12759d1d4ec6c9e43f0 Mon Sep 17 00:00:00 2001
+From 5ed74de4018515843d1c034bd57d08245a8e8a90 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/0012-Add-Change-password-link-to-the-RCUE-theme.patch b/0011-Add-Change-password-link-to-the-RCUE-theme.patch
similarity index 96%
rename from 0012-Add-Change-password-link-to-the-RCUE-theme.patch
rename to 0011-Add-Change-password-link-to-the-RCUE-theme.patch
index 26c573b..9c22b31 100644
--- a/0012-Add-Change-password-link-to-the-RCUE-theme.patch
+++ b/0011-Add-Change-password-link-to-the-RCUE-theme.patch
@@ -1,4 +1,4 @@
-From 2f3af498235c5bef4d29de471c66e8dc79c58853 Mon Sep 17 00:00:00 2001
+From 32d45e4c22fbec1da08804ed44303d8bb517d958 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.
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 264526f..65e687f 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -32,9 +32,8 @@ 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
-Patch0012: 0012-Add-Change-password-link-to-the-RCUE-theme.patch
+Patch0010: 0010-remove-runtime-dep-to-python-pbr.patch
+Patch0011: 0011-Add-Change-password-link-to-the-RCUE-theme.patch
BuildArch: noarch
@@ -60,6 +59,7 @@ BuildRequires: python-d2to1
BuildRequires: python-pbr >= 0.5.21
BuildRequires: python-lockfile
BuildRequires: python-eventlet
+BuildRequires: git
# for checks:
%if 0%{?rhel} == 0
More information about the scm-commits
mailing list