[python-django-horizon/el6-grizzly] prepare to update to 2013.1.1
Matthias Runge
mrunge at fedoraproject.org
Mon May 13 09:36:27 UTC 2013
commit 5fb674944b0275cf151d4b8a1563e0b7dc2209f5
Author: Matthias Runge <mrunge at redhat.com>
Date: Mon May 13 11:36:04 2013 +0200
prepare to update to 2013.1.1
.gitignore | 1 +
python-django-horizon.spec | 13 +++++++++----
sources | 3 +--
3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eccf333..4d9835b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/python-django-horizon-2013.1-compressed-css.tar.gz
/horizon-2013.1.tar.gz
/python-django-horizon-2013.1-compress.tar.gz
+/horizon-2013.1.1.tar.gz
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index fe1a7c0..6c87ebe 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -17,7 +17,7 @@ Source3: python-django-horizon-2013.1-compress.tar.gz
Source4: openstack-dashboard-httpd-logging.conf
#
-# patches_base=2013.1
+# patches_base=2013.1.1
#
Patch0001: 0001-disable-debug-move-web-root.patch
Patch0002: 0002-Don-t-access-the-net-while-building-docs.patch
@@ -84,8 +84,8 @@ BuildRequires: python2-devel
BuildRequires: python-django-openstack-auth
BuildRequires: python-django-compressor
BuildRequires: python-django-appconf
-#BuildRequires: nodejs
-#BuildRequires: lessjs
+BuildRequires: nodejs
+BuildRequires: nodejs-less
BuildRequires: pytz
%description -n openstack-dashboard
@@ -199,7 +199,8 @@ cp -a horizon/static/* %{buildroot}%{_datadir}/openstack-dashboard/static
# compress css, js etc.
cd %{buildroot}%{_datadir}/openstack-dashboard
-tar xzf %{SOURCE3}
+%{__python} manage.py collectstatic --noinput --pythonpath=../../lib/python2.6/site-packages/
+%{__python} manage.py compress --pythonpath=../../lib/python2.6/site-packages/
%files -f horizon.lang
%doc LICENSE README.rst openstack-dashboard-httpd-logging.conf
@@ -248,6 +249,10 @@ tar xzf %{SOURCE3}
%doc html
%changelog
+* Mon May 13 2013 Matthias Runge <mrunge at redhat.com> - 2013.1.1-1
+- update to 2013.1.1 stable release
+- move to compression using node.js/less
+
* Mon Apr 08 2013 Matthias Runge <mrunge at redhat.com> - 2013.1-1
- update to grizzly final
diff --git a/sources b/sources
index ad594bf..f0f4732 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-6655e4eae4312b6e5348d185d0b854aa horizon-2013.1.tar.gz
-c5699dffbfd46aabe3c8e0422dbae489 python-django-horizon-2013.1-compress.tar.gz
+f79025d4162cfbb7c9b27bb91611ace7 horizon-2013.1.1.tar.gz
More information about the scm-commits
mailing list