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

[Pádraig Brady]

commit 5ae994ee12cdbe644ce83210210b73968a725e43
Merge: 85e7bdb 169b5a2
Author: Alan Pevec <apevec at redhat.com>
Date:   Wed May 9 16:24:22 2012 +0100

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

 python-django-horizon.spec |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --cc python-django-horizon.spec
index c8d650f,856a2b2..6deed21
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@@ -10,7 -10,7 +10,7 @@@
  
  Name:       python-django-horizon
  Version:    2012.1
--Release:    4%{?dist}
++Release:    5%{?dist}
  Summary:    Django application for talking to Openstack
  
  Group:      Development/Libraries
@@@ -79,9 -77,8 +78,8 @@@ BuildRequires: openstack-glanc
  BuildRequires: python-cloudfiles >= 1.7.9.3
  BuildRequires: python-dateutil
  BuildRequires: python-keystoneclient
 -BuildRequires: python-novaclient >= 2012.1
 +BuildRequires: python-novaclient
  BuildRequires: python-quantumclient
- BuildRequires: python-django-nose
  
  %description doc
  Documentation for the Django Horizon application for talking with Openstack
@@@ -143,12 -139,12 +141,15 @@@ python %{_datadir}/openstack-dashboard/
  %doc html
  
  %changelog
 -* 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-5
+ - 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