[python-django-openstack-auth] Adding back the forms.Login import

[Matthias Runge]

commit ef3f1a8f13e7ca17f00bcc3846d1efcef7c83785
Author: Matthias Runge <mrunge at redhat.com>
Date:   Thu Jul 17 12:18:33 2014 +0200

    Adding back the forms.Login import

 0001-remove-runtime-dep-to-python-pbr.patch   |   22 ++++++++++++++++++
 0002-Adding-back-the-forms.Login-import.patch |   30 +++++++++++++++++++++++++
 python-django-openstack-auth.spec             |    9 +++++-
 3 files changed, 59 insertions(+), 2 deletions(-)
---
diff --git a/0001-remove-runtime-dep-to-python-pbr.patch b/0001-remove-runtime-dep-to-python-pbr.patch
new file mode 100644
index 0000000..e21aec2
--- /dev/null
+++ b/0001-remove-runtime-dep-to-python-pbr.patch
@@ -0,0 +1,22 @@
+From 6530de232e128a98f1f96db1b15e2fbb77177967 Mon Sep 17 00:00:00 2001
+From: Alan Pevec <apevec at redhat.com>
+Date: Wed, 7 May 2014 15:47:49 +0200
+Subject: [PATCH] remove runtime dep to python-pbr
+
+---
+ openstack_auth/__init__.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/openstack_auth/__init__.py b/openstack_auth/__init__.py
+index 67e4860..3995377 100644
+--- a/openstack_auth/__init__.py
++++ b/openstack_auth/__init__.py
+@@ -11,7 +11,4 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
+-import pbr.version
+-
+-
+-__version__ = pbr.version.VersionInfo('django_openstack_auth').version_string()
++__version__ = "RPMVERSION"
diff --git a/0002-Adding-back-the-forms.Login-import.patch b/0002-Adding-back-the-forms.Login-import.patch
new file mode 100644
index 0000000..4e3e248
--- /dev/null
+++ b/0002-Adding-back-the-forms.Login-import.patch
@@ -0,0 +1,30 @@
+From 69fce10d8a595ea90e4570fb9f559f95a509fbeb Mon Sep 17 00:00:00 2001
+From: David Lyle <david.lyle at hp.com>
+Date: Sat, 21 Jun 2014 14:29:04 -0600
+Subject: [PATCH] Adding back the forms.Login import
+
+Changing this breaks all older versions of Horizon. Adding it back
+in to allow older versions to continue working.
+
+Closes-Bug: #1332855
+Change-Id: Icdb206d4095b1746eef9be02ca63f2aa9cfe1081
+(cherry picked from commit 47fcf7ae4ad68b175914ab9611a59d359aa754c0)
+---
+ openstack_auth/views.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/openstack_auth/views.py b/openstack_auth/views.py
+index e423b5a..d2c73e8 100644
+--- a/openstack_auth/views.py
++++ b/openstack_auth/views.py
+@@ -29,6 +29,10 @@ from keystoneclient import exceptions as keystone_exceptions
+ from keystoneclient.v2_0 import client as keystone_client_v2
+ 
+ from openstack_auth import forms
++# This is historic and is added back in to not break older versions of
++# Horizon, fix to Horizon to remove this requirement was committed in
++# Juno
++from openstack_auth.forms import Login  # noqa
+ from openstack_auth import user as auth_user
+ from openstack_auth import utils
+ 
diff --git a/python-django-openstack-auth.spec b/python-django-openstack-auth.spec
index b646547..11209be 100644
--- a/python-django-openstack-auth.spec
+++ b/python-django-openstack-auth.spec
@@ -12,7 +12,9 @@ Source0:        http://pypi.python.org/packages/source/d/%{pypi_name}/%{pypi_nam
 #
 # patches_base=1.1.6
 #
-Patch0000:         0001-remove-runtime-dep-to-python-pbr.patch
+Patch0001: 0001-remove-runtime-dep-to-python-pbr.patch
+Patch0002: 0002-Adding-back-the-forms.Login-import.patch
+
 BuildArch:      noarch
  
 BuildRequires:  python2-devel
@@ -54,7 +56,10 @@ Keystone V2 API.
 
 %prep
 %setup -q -n %{pypi_name}-%{version}
-%patch0 -p1
+
+%patch0001 -p1
+%patch0002 -p1
+
 # Remove bundled egg-info
 # rm -rf %{pypi_name}.egg-info