[python-django-horizon/f20] rebased to 2013.2.2

[Matthias Runge]

commit 90a8cc1e4a4653aa8a33a63736505d0e1def4a3b
Author: Matthias Runge <mrunge at redhat.com>
Date:   Fri Feb 14 10:21:18 2014 +0100

    rebased to 2013.2.2

 .gitignore                 |    1 +
 python-django-horizon.spec |   14 +++++++++++---
 sources                    |    2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8274891..159545d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /horizon-2013.2.rc3.tar.gz
 /horizon-2013.2.tar.gz
 /horizon-2013.2.1.tar.gz
+/horizon-2013.2.2.tar.gz
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 19eb5a2..91efc48 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -7,7 +7,6 @@ Group:      Development/Libraries
 # Code in horizon/horizon/utils taken from django which is BSD
 License:    ASL 2.0 and BSD
 URL:        http://horizon.openstack.org/
-BuildArch:  noarch
 Source0:    https://launchpad.net/horizon/havana/%{version}/+download/horizon-%{version}.tar.gz
 Source1:    openstack-dashboard.conf
 Source2:    openstack-dashboard-httpd-2.4.conf
@@ -30,6 +29,7 @@ Patch0005: 0005-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
 Patch0006: 0006-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
 
 
+BuildArch:  noarch
 
 # epel6 has a separate Django14 package
 %if 0%{?rhel}==6
@@ -53,6 +53,7 @@ BuildRequires: python-pbr >= 0.5.21
 BuildRequires: python-lockfile
 BuildRequires: python-eventlet
 BuildRequires: python-oslo-sphinx
+BuildRequires: git
 
 # for checks:
 BuildRequires:   python-django-nose
@@ -136,7 +137,7 @@ BuildRequires: python-cinderclient
 BuildRequires: python-swiftclient
 BuildRequires: python-heatclient
 BuildRequires: python-ceilometerclient
-BuildRequires: python-troveclient
+#BuildRequires: python-troveclient
 
 %description doc
 Documentation for the Django Horizon application for talking with Openstack
@@ -150,7 +151,14 @@ Customization module for OpenStack Dashboard to provide a branded logo.
 
 %prep
 %setup -q -n horizon-%{version}
-
+# Use git to manage patches.
+# http://rwmj.wordpress.com/2011/08/09/nice-rpm-git-patch-management-trick/
+git init
+git config user.email "python-django-horizon-owner at fedoraproject.org"
+git config user.name "python-django-horizon"
+git add .
+git commit -a -q -m "%{version} baseline"
+git am %{patches}
 
 # remove unnecessary .po files
 find . -name "django*.po" -exec rm -f '{}' \;
diff --git a/sources b/sources
index 8e1816b..1d5420b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f132fedab28e8ac7db8a34fefa627ec7  horizon-2013.2.1.tar.gz
+602a0de18ef3893a6baf3be45c1d45ad  horizon-2013.2.2.tar.gz