[python-django-horizon/f20] prepare django15 compat

Matthias Runge mrunge at fedoraproject.org
Tue Jul 1 06:39:18 UTC 2014


commit cfcfbbdb46129652553e526648dd42052369789d
Author: Matthias Runge <mrunge at redhat.com>
Date:   Thu Jun 12 13:34:19 2014 +0200

    prepare django15 compat

 python-django-horizon.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index da8a588..10fe9ec 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -1,6 +1,6 @@
 Name:       python-django-horizon
 Version:    2013.2.3
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Django application for talking to Openstack
 
 Group:      Development/Libraries
@@ -38,8 +38,8 @@ BuildArch:  noarch
 Requires:   Django14
 BuildRequires:   Django14
 %else
-BuildRequires:   Django
-Requires:   Django
+BuildRequires:   python-django15
+Requires:   python-django15
 %endif
 
 
@@ -325,6 +325,9 @@ sed -i 's:^SECRET_KEY =.*:SECRET_KEY = "badcafe":' openstack_dashboard/local/loc
 %{_datadir}/openstack-dashboard/openstack_dashboard_theme
 
 %changelog
+* Thu Jun 12 2014 Matthias Runge <mrunge at redhat.com> - 2013.2.3-2
+- work with parallel installable python-django15
+
 * Thu Apr 10 2014 Matthias Runge <mrunge at redhat.com> - 2013.2.3-1
 - rebase to 2013.2.3
 - fix CVE-2014-0157 (rhbz#1085825)


More information about the scm-commits mailing list