[python-django-horizon/el6-havana] prepare for havana-2

[Matthias Runge]

commit 6b4eac4d54cb450b7671446f5507bf0f0c507183
Author: Matthias Runge <mrunge at redhat.com>
Date:   Thu Jul 25 13:17:19 2013 +0200

    prepare for havana-2

 python-django-horizon.spec |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 650d9eb..c68acef 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -1,6 +1,6 @@
 Name:       python-django-horizon
 Version:    2013.2
-Release:    0.1b1%{?dist}
+Release:    0.4b1%{?dist}
 Summary:    Django application for talking to Openstack
 
 Group:      Development/Libraries
@@ -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}.b1.tar.gz
+Source0:     https://launchpad.net/horizon/havana/havana-2/+download/horizon-%{version}.b2.tar.gz
 Source1:    openstack-dashboard.conf
 Source2:    openstack-dashboard-httpd-2.4.conf
 
@@ -16,7 +16,7 @@ Source2:    openstack-dashboard-httpd-2.4.conf
 Source4:    openstack-dashboard-httpd-logging.conf
 
 #
-# patches_base=2013.2.b1
+# patches_base=2013.2.b2
 #
 Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
 Patch0002: 0002-disable-debug-move-web-root.patch
@@ -42,16 +42,19 @@ Requires:   python-dateutil
 Requires:   python-glanceclient
 Requires:   python-keystoneclient 
 Requires:   python-novaclient >= 2012.1
-Requires:   python-quantumclient
+Requires:   python-neutronclient
 Requires:   python-cinderclient
 Requires:   python-swiftclient
 Requires:   python-heatclient
+Requires:   python-ceilometerclient
 Requires:   pytz
+Requires:   python-lockfile
 
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
 BuildRequires: python-pbr
 BuildRequires: python-d2to1
+BuildRequires: python-lockfile
 
 # for checks:
 #BuildRequires:   python-django-nose
@@ -113,17 +116,18 @@ BuildRequires: python-dateutil
 BuildRequires: python-glanceclient
 BuildRequires: python-keystoneclient
 BuildRequires: python-novaclient >= 2012.1
-BuildRequires: python-quantumclient
+BuildRequires: python-neutronclient
 BuildRequires: python-cinderclient
 BuildRequires: python-swiftclient
 BuildRequires: python-heatclient
+BuildRequires: python-ceilometerclient
 
 %description doc
 Documentation for the Django Horizon application for talking with Openstack
 
 
 %prep
-%setup -q -n horizon-%{version}.b1
+%setup -q -n horizon-%{version}.b2
 
 %patch0001 -p1
 %patch0002 -p1
@@ -147,6 +151,7 @@ install -m 0644 -D -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/opensta
 install -m 0644 -D -p %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf
 %endif
 
+cp openstack_dashboard/local/local_settings.py.example openstack_dashboard/local/local_settings.py
 export PYTHONPATH="$( pwd ):$PYTHONPATH"
 %if 0%{?rhel}==6
 sphinx-1.0-build -b html doc/source html
@@ -169,6 +174,7 @@ rm -rf %{buildroot}%{python_sitelib}/openstack_dashboard
 
 
 # Move config to /etc, symlink it back to /usr/share
+rm openstack_dashboard/local/local_settings.py
 mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.py.example %{buildroot}%{_sysconfdir}/openstack-dashboard/local_settings
 ln -s %{_sysconfdir}/openstack-dashboard/local_settings %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.py
 
@@ -231,10 +237,12 @@ cd %{buildroot}%{_datadir}/openstack-dashboard
 %{_datadir}/openstack-dashboard/openstack_dashboard/api
 %{_datadir}/openstack-dashboard/openstack_dashboard/dashboards
 %{_datadir}/openstack-dashboard/openstack_dashboard/local
+%{_datadir}/openstack-dashboard/openstack_dashboard/openstack
 %{_datadir}/openstack-dashboard/openstack_dashboard/static
 %{_datadir}/openstack-dashboard/openstack_dashboard/templates
 %{_datadir}/openstack-dashboard/openstack_dashboard/test
 %{_datadir}/openstack-dashboard/openstack_dashboard/usage
+%{_datadir}/openstack-dashboard/openstack_dashboard/utils
 %{_datadir}/openstack-dashboard/openstack_dashboard/wsgi
 %dir %{_datadir}/openstack-dashboard/openstack_dashboard/locale
 %dir %{_datadir}/openstack-dashboard/openstack_dashboard/locale/??
@@ -250,6 +258,12 @@ cd %{buildroot}%{_datadir}/openstack-dashboard
 %doc html 
 
 %changelog
+* Thu Jul 25 2013 Matthias Runge <mrunge at redhat.com> - 2013.2-0.4b2
+- havana-2
+- change requirements from python-quantumclient to neutronclient
+- require python-ceilometerclient
+- add requirement python-lockfile, change lockfile location to /tmp
+
 * Mon Jun 03 2013 Matthias Runge <mrunge at redhat.com> - 2013.2-0.1b1
 - update to 2013.2.b1