[python-django-horizon/f18] use nodejs/less.js to compress, re-arrange patches, requires python-netaddr
Matthias Runge
mrunge at fedoraproject.org
Sat Jan 19 17:29:38 UTC 2013
commit 7e24e298fcd217dc810d389a01ad3bb060313d6f
Author: Matthias Runge <mrunge at redhat.com>
Date: Sat Jan 19 18:28:59 2013 +0100
use nodejs/less.js to compress, re-arrange patches, requires python-netaddr
python-django-horizon.spec | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index a0857cc..68840a1 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -23,13 +23,6 @@ Patch0004: 0004-Pin-docutils-to-0.9.1-fix-pep8-errors.patch
Patch0005: 0005-disable-debug-move-web-root.patch
Patch0006: 0006-disable-to-set-mount-point-as-it-s-unsupported-here.patch
-# change settings to use offline compression
-# disable debug also in local_settings.py
-
-# take variables out of compressed output
-
-# move dashboard login/logout to /dashboard
-
%if 0%{?rhel}<7 || 0%{?fedora} < 18
@@ -86,8 +79,12 @@ Requires: python-django-openstack-auth
Requires: python-django-compressor
BuildRequires: python2-devel
+# required for building compressed css, js
BuildRequires: nodejs
BuildRequires: lessjs
+BuildRequires: python-django
+BuildRequires: python-django-openstack-auth
+BuildRequires: python-django-compressor
%description -n openstack-dashboard
Openstack Dashboard is a web user interface for Openstack. The package
@@ -113,6 +110,8 @@ BuildRequires: python-glanceclient
BuildRequires: python-keystoneclient
BuildRequires: python-novaclient >= 2012.1
BuildRequires: python-quantumclient
+BuildRequires: python-cinderclient
+BuildRequires: python-swiftclient
%description doc
Documentation for the Django Horizon application for talking with Openstack
@@ -206,9 +205,8 @@ cp -a horizon/static/* %{buildroot}%{_datadir}/openstack-dashboard/static
# finally put compressed js, css to the right place, and also manifest.json
cd %{buildroot}%{_datadir}/openstack-dashboard
-#tar xzf %{SOURCE3}
-python manage.py collectstatic --noinput
-python manage.py compress
+%{__python} manage.py collectstatic --noinput --pythonpath=../../lib/python2.7/site-packages/
+python manage.py compress --pythonpath=../../lib/python2.7/site-packages/
%files -f horizon.lang
@@ -258,7 +256,7 @@ python manage.py compress
%doc html
%changelog
-* Thu Jan 17 2013 Matthias Runge <mrunge at redhat.com> - 2012.2.1-2
+* Sat Jan 19 2013 Matthias Runge <mrunge at redhat.com> - 2012.2.1-2
- use nodejs/lessjs to compress
- re-arrange SPEC to pull patches from github
- disable option to set mountpoint
More information about the scm-commits
mailing list