From: Sergey Otpuschennikov <sotpuschennikov@mirantis.com>
Date: Wed, 19 Feb 2014 12:04:55 +0000 (+0400)
Subject: Changed requirements to python-django
X-Git-Tag: 2014.1~10
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=88a1048e737c00c2de95e3429e789a0e4ea7402c;p=openstack-build%2Fhorizon-build.git

Changed requirements to python-django

Change-Id: I73d56f5f6efaac1fb6d5fed78a06358820baf4ce
---

diff --git a/rpm/SPECS/python-django-horizon.spec b/rpm/SPECS/python-django-horizon.spec
index 2db5e7e..b06a7e7 100644
--- a/rpm/SPECS/python-django-horizon.spec
+++ b/rpm/SPECS/python-django-horizon.spec
@@ -8,7 +8,7 @@ Group:      Development/Libraries
 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
+Source0:    horizon-2013.2.2.fuel4.1.tar.gz 
 Source1:    openstack-dashboard.conf
 Source2:    openstack-dashboard-httpd-2.4.conf
 
@@ -38,14 +38,9 @@ Patch0101: mos-fix-murano-savana-dashboard.patch
 
 
 
-# epel6 has a separate Django14 package
-%if 0%{?rhel}==6
-Requires:   Django14
-BuildRequires:   Django14
-%else
-BuildRequires:   Django
-Requires:   Django
-%endif
+# Migrate to Django 15 (python-django)
+BuildRequires:  python-django
+Requires:  python-django
 
 
 Requires:   python-dateutil
@@ -63,7 +58,7 @@ BuildRequires: python-netaddr
 # for checks:
 #BuildRequires:   python-django-nose
 #BuildRequires:   python-coverage
-#BuildRequires:   python-mox
+BuildRequires:   python-mox
 #BuildRequires:   python-nose-exclude
 #BuildRequires:   python-eventlet
 #BuildRequires:   python-kombu