[python-django-horizon/f22] rebased to 2014.2.2

[Matthias Runge]

commit 5f17edd0676b19483d1b45554c3de3335f1756d9
Author: Matthias Runge <mrunge at redhat.com>
Date:   Thu Feb 12 13:30:42 2015 +0100

    rebased to 2014.2.2
    
    Change-Id: I9d9b93a1a13b034cd21d49e55f5acb2079313a63

 .gitignore                 |    1 +
 python-django-horizon.spec |    7 +++++--
 sources                    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 37c2e4f..174a672 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 /horizon-2014.2.rc2.tar.gz
 /horizon-2014.2.tar.gz
 /horizon-2014.2.1.tar.gz
+/horizon-2014.2.2.tar.gz
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 7e70fc6..68d53be 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -158,7 +158,7 @@ BuildRequires: python-oslo-config
 BuildRequires: python-django-pyscss >= 1.0.5
 BuildRequires: python-XStatic
 BuildRequires: python-XStatic-jQuery
-BuildRequires: python-XStatic-Angular
+BuildRequires: python-XStatic-Angular =< 1.3.0
 # obsoleted by python-XStatic-Angular in f22+
 BuildRequires: python-XStatic-Angular-Cookies
 BuildRequires: python-XStatic-Angular-Mock
@@ -272,7 +272,7 @@ cp openstack_dashboard/local/local_settings.py.example openstack_dashboard/local
 # dirty hack to make SECRET_KEY work:
 
 
-%{__python} manage.py collectstatic --noinput 
+%{__python} manage.py collectstatic --noinput
 
 # offline compression
 %if 0%{?with_compression} > 0
@@ -443,6 +443,9 @@ cp -a %{SOURCE5} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-dashboard
 %{_datadir}/openstack-dashboard/openstack_dashboard/enabled/_99_customization.*
 
 %changelog
+* Thu Fed 12 2015 Matthias Runge <mrunge at redhat.com> - 2014.2.2-1
+- rebased to 2014.2.2
+
 * Mon Dec 15 2014 Matthias Runge <mrunge at redhat.com> - 2014.2.1-2
 - Fix CVE-2014-8124 (rhbz#1174066)
 
diff --git a/sources b/sources
index 09eafa4..afba836 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5635c02d1a7683c0bbf95d4d454c5ed  horizon-2014.2.1.tar.gz
+40855fdf1501d6a14b396b7f0707edce  horizon-2014.2.2.tar.gz