[python-django-horizon: 7/7] cleanup, renamed customization module to custom

[Matthias Runge]

commit 9e493ab428712c175fac4f0a0dd5a0beffcc5793
Author: Matthias Runge <mrunge at redhat.com>
Date:   Tue Sep 3 13:36:20 2013 +0200

    cleanup, renamed customization module to custom

 python-django-horizon.spec |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 9c6927e..6169241 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -169,7 +169,6 @@ cp %{SOURCE11} openstack_dashboard_theme/static/dashboard/img
 cp -p %{SOURCE4} .
 
 %build
-# SKIP_PIP_INSTALL=1 %{__python} setup.py build
 %{__python} setup.py build
 
 # compress css, js etc.
@@ -177,17 +176,9 @@ cp openstack_dashboard/local/local_settings.py.example openstack_dashboard/local
 %{__python} manage.py collectstatic --noinput --pythonpath=../../lib/python2.7/site-packages/ 
 %{__python} manage.py compress --pythonpath=../../lib/python2.7/site-packages/
 
-%install
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-
-# drop httpd-conf snippet
-%if 0%{?rhel} || 0%{?fedora} <18
-install -m 0644 -D -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf
-%else
-# httpd-2.4 changed the syntax
-install -m 0644 -D -p %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf
-%endif
+cp -a static/dashboard %{_buildir}
 
+# build docs
 export PYTHONPATH="$( pwd ):$PYTHONPATH"
 %if 0%{?rhel}==6
 sphinx-1.0-build -b html doc/source html
@@ -198,6 +189,16 @@ sphinx-build -b html doc/source html
 # Fix hidden-file-or-dir warnings
 rm -fr html/.doctrees html/.buildinfo
 
+%install
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+
+# drop httpd-conf snippet
+%if 0%{?rhel} || 0%{?fedora} <18
+install -m 0644 -D -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf
+%else
+# httpd-2.4 changed the syntax
+install -m 0644 -D -p %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf
+%endif
 install -d -m 755 %{buildroot}%{_datadir}/openstack-dashboard
 install -d -m 755 %{buildroot}%{_sharedstatedir}/openstack-dashboard
 install -d -m 755 %{buildroot}%{_sysconfdir}/openstack-dashboard
@@ -242,6 +243,7 @@ cat djangojs.lang >> horizon.lang
 mkdir -p %{buildroot}%{_datadir}/openstack-dashboard/static
 cp -a openstack_dashboard/static/* %{buildroot}%{_datadir}/openstack-dashboard/static
 cp -a horizon/static/* %{buildroot}%{_datadir}/openstack-dashboard/static 
+cp -a static/* %{buildroot}%{_datadir}/openstack-dashboard/static
 
 %check
 ./run_tests.sh -N
@@ -300,7 +302,7 @@ cp -a horizon/static/* %{buildroot}%{_datadir}/openstack-dashboard/static
 
 %changelog
 * Wed Aug 28 2013 Matthias Runge <mrunge at redhat.com> - 2013.2-0.8b2
-- add a -rhos subpackage for the rhos logo
+- add a -custom subpackage to use a custom logo
 
 * Mon Aug 26 2013 Matthias Runge <mrunge at redhat.com> - 2013.2-0.7b2
 - enable tests in check section (rhbz#856182)