Changed requirements to python-django
authorSergey Otpuschennikov <sotpuschennikov@mirantis.com>
Wed, 19 Feb 2014 12:04:55 +0000 (16:04 +0400)
committerSergey Otpuschennikov <sotpuschennikov@mirantis.com>
Wed, 19 Feb 2014 14:32:11 +0000 (18:32 +0400)
Change-Id: I73d56f5f6efaac1fb6d5fed78a06358820baf4ce

rpm/SPECS/python-django-horizon.spec

index 2db5e7ee8a42a6e856ab3456a6513732b5e23d23..b06a7e7fa863d23b0f1346b1258d48e7eee60e44 100644 (file)
@@ -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