[python-django-horizon/el6-grizzly] Updated patches from el6-grizzly-patches
Matthias Runge
mrunge at fedoraproject.org
Thu Oct 24 11:21:24 UTC 2013
commit 345056ce4b65031e66319882e0b3c57cd41f6b30
Author: Matthias Runge <mrunge at redhat.com>
Date: Thu Oct 24 09:27:34 2013 +0200
Updated patches from el6-grizzly-patches
...p-stable-grizzly-next-version-to-2013.1.4.patch | 23 --------------------
...patch => 0001-disable-debug-move-web-root.patch | 2 +-
...-Don-t-access-the-net-while-building-docs.patch | 2 +-
python-django-horizon.spec | 6 +---
4 files changed, 4 insertions(+), 29 deletions(-)
---
diff --git a/0002-disable-debug-move-web-root.patch b/0001-disable-debug-move-web-root.patch
similarity index 97%
rename from 0002-disable-debug-move-web-root.patch
rename to 0001-disable-debug-move-web-root.patch
index d4047c7..eaebd2d 100644
--- a/0002-disable-debug-move-web-root.patch
+++ b/0001-disable-debug-move-web-root.patch
@@ -1,4 +1,4 @@
-From 98191b2f161649b62eb1f69b2580be8f66cee8b9 Mon Sep 17 00:00:00 2001
+From 3c7f9b293b151834033ba379e02c8b6853b06ea7 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-Don-t-access-the-net-while-building-docs.patch b/0002-Don-t-access-the-net-while-building-docs.patch
similarity index 91%
rename from 0003-Don-t-access-the-net-while-building-docs.patch
rename to 0002-Don-t-access-the-net-while-building-docs.patch
index d442315..1bf8950 100644
--- a/0003-Don-t-access-the-net-while-building-docs.patch
+++ b/0002-Don-t-access-the-net-while-building-docs.patch
@@ -1,4 +1,4 @@
-From 58b5ad25f4bd34ff9f4b27bf72f2efd039bf24bf Mon Sep 17 00:00:00 2001
+From 3360e864f4af15a5fc7d4b3df5f19c376a4fd894 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/python-django-horizon.spec b/python-django-horizon.spec
index 89c6886..4de65a1 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -18,9 +18,8 @@ Source4: openstack-dashboard-httpd-logging.conf
#
# patches_base=2013.1.4
#
-Patch0001: 0001-Bump-stable-grizzly-next-version-to-2013.1.4.patch
-Patch0002: 0002-disable-debug-move-web-root.patch
-Patch0003: 0003-Don-t-access-the-net-while-building-docs.patch
+Patch0001: 0001-disable-debug-move-web-root.patch
+Patch0002: 0002-Don-t-access-the-net-while-building-docs.patch
%if 0%{?rhel}>6 || 0%{?fedora} > 18
# grizzly requires python-django14
@@ -126,7 +125,6 @@ Documentation for the Django Horizon application for talking with Openstack
%patch0001 -p1
%patch0002 -p1
-%patch0003 -p1
# remove unnecessary .po files
find . -name "django*.po" -exec rm -f '{}' \;
More information about the scm-commits
mailing list