[python-django-horizon/f18] change build to use nodejs, pull patches from scm
Matthias Runge
mrunge at fedoraproject.org
Thu Jan 17 09:25:57 UTC 2013
commit b9891da1d95429d1aa211fbf68706b6fd8cc0c98
Author: Matthias Runge <mrunge at redhat.com>
Date: Fri Jan 11 11:13:04 2013 +0100
change build to use nodejs, pull patches from scm
python-django-horizon.spec | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 38403b6..45174a2 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -1,6 +1,6 @@
Name: python-django-horizon
Version: 2012.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Django application for talking to Openstack
Group: Development/Libraries
@@ -13,8 +13,9 @@ Source0: http://launchpad.net/horizon/folsom/%{version}/+download/horizon-%{v
Source1: openstack-dashboard.conf
Source2: openstack-dashboard-httpd-2.4.conf
-# offline compressed css, js
-Source3: python-django-horizon-compressed-css.tar.gz
+#
+# patches_base=2012.2.1
+#
# change settings to use offline compression
Patch0: python-django-horizon-dashboard-settings.patch
@@ -82,6 +83,8 @@ Requires: python-django-openstack-auth
Requires: python-django-compressor
BuildRequires: python2-devel
+BuildRequires: nodejs
+BuildRequires: lessjs
%description -n openstack-dashboard
Openstack Dashboard is a web user interface for Openstack. The package
@@ -198,7 +201,9 @@ 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}
+#tar xzf %{SOURCE3}
+python manage.py collectstatic --noinput
+python manage.py compress
%files -f horizon.lang
@@ -248,6 +253,10 @@ tar xzf %{SOURCE3}
%doc html
%changelog
+* Fri Jan 11 2013 Matthias Runge <mrunge at redhat.com> - 2012.2.1-2
+- use nodejs/lessjs to compress
+- re-arrange SPEC to pull patches from github
+
* Mon Dec 03 2012 Matthias Runge <mrunge at redhat.com> - 2012.2.1-1
- update to latest stable release 2012.2.1
More information about the scm-commits
mailing list