[python-django-horizon/el6: 11/11] Merge branch 'f17' into el6

[Pádraig Brady]

commit bbf55f59cbeb77e6e77f9daeaf5020a1bdb35b64
Merge: 5ae994e cdc5153
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Jun 1 00:48:31 2012 +0100

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

 python-django-horizon-disable-nose.patch |   18 ++++++++++++++++++
 python-django-horizon.spec               |    6 ++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --cc python-django-horizon.spec
index 6deed21,6182eb8..84a5ac3
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@@ -10,7 -10,7 +10,7 @@@
  
  Name:       python-django-horizon
  Version:    2012.1
- Release:    5%{?dist}
 -Release:    4%{?dist}
++Release:    6%{?dist}
  Summary:    Django application for talking to Openstack
  
  Group:      Development/Libraries
@@@ -25,8 -25,8 +25,9 @@@ 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
 -Patch5:     %{name}-disable-nose.patch
 +Patch4:     sphinx-sidebarwidth.patch
 +Patch5:     CVE-2012-2144-session_fixation.patch
++Patch6:     %{name}-disable-nose.patch
  
  Requires:   Django >= 1.3.0
  Requires:   openstack-glance >= 2012.1
@@@ -92,6 -92,6 +93,7 @@@ Documentation for the Django Horizon ap
  %patch3 -p1
  %patch4 -p1
  %patch5 -p1
++%patch6 -p1
  
  %build
  %{__python} setup.py build
@@@ -141,15 -141,12 +143,15 @@@ python %{_datadir}/openstack-dashboard/
  %doc html
  
  %changelog
- * Wed May 09 2012 Alan Pevec <apevec at redhat.com> - 2012.1-5
 -* Wed May 09 2012 Alan Pevec <apevec at redhat.com> - 2012.1-4
++* Wed May 09 2012 Alan Pevec <apevec at redhat.com> - 2012.1-6
  - Remove the currently uneeded dependency on python-django-nose
  
 -* 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