[python-django-horizon/f18] Updated patches from f18-patches

[Matthias Runge]

commit 948c7714f9507f1f087dbc7d8bc4f9d0134d7894
Author: Matthias Runge <mrunge at redhat.com>
Date:   Fri Feb 8 11:55:15 2013 +0100

    Updated patches from f18-patches

 0001-Revert-Temp-fix-for-api-keystone.py.patch     |   34 ---
 ...patch => 0001-disable-debug-move-web-root.patch |    2 +-
 ...5929-Can-not-display-usage-data-for-Quota.patch |   34 ---
 ...2-take-variables-out-of-compressed-output.patch |    2 +-
 0003-Bump-next-version-to-2012.2.2.patch           |   26 ---
 0004-Pin-docutils-to-0.9.1-fix-pep8-errors.patch   |   53 -----
 ...-floating-ips-table-action-column-s-width.patch |   26 ---
 ...-inherit-from-base.html-in-500-error-page.patch |  221 ------------------
 0007-Allow-setting-nova-quotas-to-unlimited.patch  |   46 ----
 ...d-cinder-calls-when-cinder-is-unavailable.patch |  236 --------------------
 0009-disable-debug-move-web-root.patch             |   70 ------
 0010-Add-a-check-for-unlimited-quotas.patch        |   90 --------
 ...-set-mount-point-as-it-s-unsupported-here.patch |   22 --
 CVE-2012-2144-session_fixation.patch               |  155 -------------
 python-django-horizon.spec                         |   25 +--
 xss-in-log-viewer.patch                            |   23 --
 16 files changed, 4 insertions(+), 1061 deletions(-)
---
diff --git a/0012-disable-debug-move-web-root.patch b/0001-disable-debug-move-web-root.patch
similarity index 97%
rename from 0012-disable-debug-move-web-root.patch
rename to 0001-disable-debug-move-web-root.patch
index 8453d80..53c5d18 100644
--- a/0012-disable-debug-move-web-root.patch
+++ b/0001-disable-debug-move-web-root.patch
@@ -1,4 +1,4 @@
-From e852e4afb29bc04567fe77cf0dfa0871215e6181 Mon Sep 17 00:00:00 2001
+From 4219a846e1eee41af16f8faeab6d5cf191dabc8f Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge at redhat.com>
 Date: Tue, 4 Dec 2012 13:46:22 +0100
 Subject: [PATCH] disable debug, move web root
diff --git a/0013-take-variables-out-of-compressed-output.patch b/0002-take-variables-out-of-compressed-output.patch
similarity index 93%
rename from 0013-take-variables-out-of-compressed-output.patch
rename to 0002-take-variables-out-of-compressed-output.patch
index 5daf241..7ff1cf3 100644
--- a/0013-take-variables-out-of-compressed-output.patch
+++ b/0002-take-variables-out-of-compressed-output.patch
@@ -1,4 +1,4 @@
-From fcd27175f278caebbdaff92553dc1fe3f8957f66 Mon Sep 17 00:00:00 2001
+From 006a606dbb506c4752aa629e4cdc4cf6b7865f9a Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge at redhat.com>
 Date: Mon, 21 Jan 2013 10:19:23 +0100
 Subject: [PATCH] take variables out of compressed output
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index e6e5049..52cc1b4 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -16,19 +16,9 @@ Source2:    openstack-dashboard-httpd-2.4.conf
 #
 # patches_base=2012.2.3+1
 # 
-Patch0001: 0001-Revert-Temp-fix-for-api-keystone.py.patch
-Patch0002: 0002-Fix-bug-1055929-Can-not-display-usage-data-for-Quota.patch
-Patch0003: 0003-Bump-next-version-to-2012.2.2.patch
-Patch0004: 0004-Pin-docutils-to-0.9.1-fix-pep8-errors.patch
-Patch0005: 0005-Specify-floating-ips-table-action-column-s-width.patch
-Patch0006: 0006-Don-t-inherit-from-base.html-in-500-error-page.patch
-Patch0007: 0007-Allow-setting-nova-quotas-to-unlimited.patch
-Patch0008: 0008-Avoid-cinder-calls-when-cinder-is-unavailable.patch
-Patch0009: 0009-disable-debug-move-web-root.patch
-Patch0010: 0010-Add-a-check-for-unlimited-quotas.patch
-Patch0011: 0011-disable-to-set-mount-point-as-it-s-unsupported-here.patch
+Patch0001: 0001-disable-debug-move-web-root.patch
+Patch0002: 0002-take-variables-out-of-compressed-output.patch
 # Patch0012: 0012-disable-debug-move-web-root.patch
-Patch0013: 0013-take-variables-out-of-compressed-output.patch
 
 
 %if 0%{?rhel}<7 || 0%{?fedora} < 18
@@ -129,17 +119,6 @@ Documentation for the Django Horizon application for talking with Openstack
 
 %patch0001 -p1
 %patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
-%patch0006 -p1
-%patch0007 -p1
-%patch0008 -p1
-%patch0009 -p1
-%patch0010 -p1
-%patch0011 -p1
-#%patch0012 -p1
-%patch0013 -p1
 # remove unnecessary .po files
 find . -name "django*.po" -exec rm -f '{}' \;