[python-django-horizon/el6-icehouse: 1/2] provide new sources

Matthias Runge mrunge at fedoraproject.org
Fri Dec 13 08:27:53 UTC 2013


commit 2553eec89102c3df8869015d4405ecf6efb872e4
Author: Matthias Runge <mrunge at redhat.com>
Date:   Thu Dec 12 08:50:48 2013 +0100

    provide new sources
    
    make compression conditional

 .gitignore                 |    1 +
 python-django-horizon.spec |   24 +++++++++++++++++++-----
 sources                    |    2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c0cc346..2e47a9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /horizon-2013.2.rc2.tar.gz
 /horizon-2013.2.rc3.tar.gz
 /horizon-2013.2.tar.gz
+/horizon-2014.1.b1.tar.gz
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index fbb43c6..52ff514 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -1,3 +1,5 @@
+%global with_compression 1
+
 Name:       python-django-horizon
 Version:    2014.1
 Release:    0.1b1%{?dist}
@@ -60,16 +62,16 @@ BuildRequires: python-lockfile
 BuildRequires: python-eventlet
 
 # for checks:
-BuildRequires:   python-django-nose
-BuildRequires:   python-coverage
+#BuildRequires:   python-django-nose
+#BuildRequires:   python-coverage
 BuildRequires:   python-mox
-BuildRequires:   python-nose-exclude
+#BuildRequires:   python-nose-exclude
 BuildRequires:   python-netaddr
 BuildRequires:   python-kombu
 BuildRequires:   python-anyjson
 BuildRequires:   pytz
 BuildRequires:   python-iso8601
-BuildRequires:   python-nose
+#BuildRequires:   python-nose
 
 
 # additional provides to be consistent with other django packages
@@ -92,6 +94,10 @@ Requires:   mod_wsgi
 Requires:   python-django-horizon >= %{version}
 Requires:   python-django-openstack-auth >= 1.1.3
 Requires:   python-django-compressor >= 1.3
+%if %{with_compression} > 0
+Requires: python-lesscpy
+%endif
+
 Requires:   python-django-appconf
 Requires:   python-glanceclient
 Requires:   python-keystoneclient >= 0.3.2
@@ -193,9 +199,14 @@ cp -p %{SOURCE4} .
 cp openstack_dashboard/local/local_settings.py.example openstack_dashboard/local/local_settings.py
 # dirty hack to make SECRET_KEY work:
 sed -i 's:^SECRET_KEY =.*:SECRET_KEY = "badcafe":' openstack_dashboard/local/local_settings.py
+
+%if %{with_compression} > 0
 %{__python} manage.py collectstatic --noinput 
 %{__python} manage.py compress 
 cp -a static/dashboard %{_buildir}
+%else
+sed -i 's:COMPRESS_OFFLINE = True:COMPRESS_OFFLINE = False:' openstack_dashboard/settings.py
+%endif
 
 # build docs
 export PYTHONPATH="$( pwd ):$PYTHONPATH"
@@ -277,8 +288,10 @@ mkdir -p %{buildroot}%{_var}/log/horizon
 
 
 %check
+%if 0%{?rhel} == 0
 sed -i 's:^SECRET_KEY =.*:SECRET_KEY = "badcafe":' openstack_dashboard/local/local_settings.py
 ./run_tests.sh -N -P
+%endif
 
 %files -f horizon.lang
 %doc LICENSE README.rst openstack-dashboard-httpd-logging.conf
@@ -334,8 +347,9 @@ sed -i 's:^SECRET_KEY =.*:SECRET_KEY = "badcafe":' openstack_dashboard/local/loc
 %{_datadir}/openstack-dashboard/openstack_dashboard_theme
 
 %changelog
-* Fri Dec 06 2013 Matthias Runge <mrunge at redhat.com> - 2014.1-0.1b1
+* Fri Dec 13 2013 Matthias Runge <mrunge at redhat.com> - 2014.1-0.1b1
 - rebase to 2014.1.b1
+- make compression conditional
 
 * Mon Dec 02 2013 Matthias Runge <mrunge at redhat.com> - 2013.2-4
 - fixes CVE-2013-6406 (rhbz#1035913)
diff --git a/sources b/sources
index 335ffed..f3a0a22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-647de35feb2f76b7f44a2104b528334a  horizon-2013.2.tar.gz
+21c093a66753af64e19f6dea98d3cbfa  horizon-2014.1.b1.tar.gz


More information about the scm-commits mailing list