[python-django-horizon/el6: 3/3] Merge branch 'master' into el6

[Pádraig Brady]

commit 85e7bdbca7aa0b131f3ff668d63bb22caf37bb33
Merge: ecf6480 3bb3722
Author: Pádraig Brady <P at draigBrady.com>
Date:   Sat May 5 01:25:16 2012 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	python-django-horizon.spec

 CVE-2012-2144-session_fixation.patch |  155 ++++++++++++++++++++++++++++++++++
 python-django-horizon.spec           |    7 ++-
 2 files changed, 161 insertions(+), 1 deletions(-)
---
diff --cc python-django-horizon.spec
index 6b814db,12e669b..c8d650f
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@@ -10,7 -10,7 +10,7 @@@
  
  Name:       python-django-horizon
  Version:    2012.1
--Release:    3%{?dist}
++Release:    4%{?dist}
  Summary:    Django application for talking to Openstack
  
  Group:      Development/Libraries
@@@ -25,7 -25,7 +25,8 @@@ Source1:    openstack-dashboard.con
  Patch1:     %{name}-disable-debug.patch
  Patch2:     %{name}-default-db.patch
  Patch3:     xss-in-log-viewer.patch
 -Patch4:     CVE-2012-2144-session_fixation.patch
 +Patch4:     sphinx-sidebarwidth.patch
++Patch5:     CVE-2012-2144-session_fixation.patch
  
  Requires:   Django >= 1.3.0
  Requires:   openstack-glance >= 2012.1
@@@ -92,6 -92,6 +93,7 @@@ Documentation for the Django Horizon ap
  %patch2 -p1
  %patch3 -p1
  %patch4 -p1
++%patch5 -p1
  
  %build
  %{__python} setup.py build
@@@ -141,9 -141,9 +143,12 @@@ python %{_datadir}/openstack-dashboard/
  %doc html
  
  %changelog
 -* Thu May 03 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-3
++* Thu May 03 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-4
+ - CVE-2012-2144 session reuse vulnerability
+ 
 +* Wed Apr 18 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-3
 +- Depend on Django >= 1.3.0 (now in epel)
 +
  * Tue Apr 17 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-2
  - CVE-2012-2094 XSS vulnerability in Horizon log viewer
  - Configure the default database to use