[openstack-tuskar-ui] Duplicating static copy to python_sitelib

[Jordan O'Mara]

commit 7ca806dfe4b6c38d3fb06b22d8f45d9106c5d872
Author: Jordan OMara <jomara at redhat.com>
Date:   Tue Oct 28 13:11:43 2014 -0400

    Duplicating static copy to python_sitelib

 openstack-tuskar-ui.spec |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/openstack-tuskar-ui.spec b/openstack-tuskar-ui.spec
index c6a2ac0..f14f4e5 100644
--- a/openstack-tuskar-ui.spec
+++ b/openstack-tuskar-ui.spec
@@ -2,7 +2,7 @@
 
 Name:	      openstack-tuskar-ui
 Version:	  0.2.0
-Release:	  4%{?dist}
+Release:	  5%{?dist}
 Summary:	  The UI component for Tuskar
 
 Group:		  Applications/System
@@ -100,13 +100,21 @@ export OSLO_PACKAGE_VERSION=%{version}
 # Move config to horizon
 mkdir -p  %{buildroot}%{_sysconfdir}/openstack-dashboard/enabled
 mkdir -p  %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/enabled
+mv _10_admin.py.example %{buildroot}%{_sysconfdir}/openstack-dashboard/enabled/_10_admin.py
+mv _20_project.py.example %{buildroot}%{_sysconfdir}/openstack-dashboard/enabled/_20_project.py
+mv _30_identity.py.example %{buildroot}%{_sysconfdir}/openstack-dashboard/enabled/_30_identity.py
 mv _50_tuskar.py.example %{buildroot}%{_sysconfdir}/openstack-dashboard/enabled/_50_tuskar.py
+ln -s %{_sysconfdir}/openstack-dashboard/enabled/_10_admin.py %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/enabled/_10_admin.py
+ln -s %{_sysconfdir}/openstack-dashboard/enabled/_20_project.py %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/enabled/_20_project.py
+ln -s %{_sysconfdir}/openstack-dashboard/enabled/_30_identity.py %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/enabled/_30_identity.py
 ln -s %{_sysconfdir}/openstack-dashboard/enabled/_50_tuskar.py %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/enabled/_50_tuskar.py
 
 # Move static files to horizon. These require that you compile them again
 # post install { python manage.py compress }
 mkdir -p  %{buildroot}%{_datadir}/openstack-dashboard/static/infrastructure
 cp -r tuskar_ui/infrastructure/static/infrastructure/* %{buildroot}%{_datadir}/openstack-dashboard/static/infrastructure/
+mkdir -p  %{buildroot}%{python_sitelib}/tuskar_ui/static/infrastructure
+cp -r tuskar_ui/infrastructure/static/infrastructure/* %{buildroot}%{python_sitelib}/tuskar_ui/infrastructure/static/infrastructure/
 
 %files
 %doc LICENSE README.rst
@@ -115,15 +123,22 @@ cp -r tuskar_ui/infrastructure/static/infrastructure/* %{buildroot}%{_datadir}/o
 %{python_sitelib}/tuskar_ui/*.py*
 %{python_sitelib}/tuskar_ui/test
 %{python_sitelib}/tuskar_ui/infrastructure
+%{python_sitelib}/tuskar_ui/static
 %{python_sitelib}/tuskar_ui/utils
 %{python_sitelib}/tuskar_ui/api
 %{python_sitelib}/tuskar_ui/infrastructure/templates
+%{_datadir}/openstack-dashboard/openstack_dashboard/local/enabled/_10_admin.py*
+%{_datadir}/openstack-dashboard/openstack_dashboard/local/enabled/_20_project.py*
+%{_datadir}/openstack-dashboard/openstack_dashboard/local/enabled/_30_identity.py*
 %{_datadir}/openstack-dashboard/openstack_dashboard/local/enabled/_50_tuskar.py*
 %dir %{_datadir}/openstack-dashboard/static/infrastructure
 %{_datadir}/openstack-dashboard/static/infrastructure/js
 %{_datadir}/openstack-dashboard/static/infrastructure/tests
 %{_datadir}/openstack-dashboard/static/infrastructure/scss
 %{_datadir}/openstack-dashboard/static/infrastructure/images
+%{_sysconfdir}/openstack-dashboard/enabled/_10_admin.py*
+%{_sysconfdir}/openstack-dashboard/enabled/_20_project.py*
+%{_sysconfdir}/openstack-dashboard/enabled/_30_identity.py*
 %{_sysconfdir}/openstack-dashboard/enabled/_50_tuskar.py*
 
 %check
@@ -135,8 +150,8 @@ export PYTHONPATH=$PYTHONPATH:%{_datadir}/openstack-dashboard
 %endif
 
 %changelog
-* Fri Oct 23 2014 Jordan OMara <jomara at redhat.com> - 0.2.0-3
-- conditionally loading test deps (not on RHEL) (jomara at redhat.com)
+* Tue Oct 28 2014 Jordan OMara <jomara at redhat.com> - 0.2.0-5
+- changes to static file locations to more closely mirror horizon (jomara at redhat.com)
 
 * Fri Oct 17 2014 Jordan OMara <jomara at redhat.com> - 0.2.0-2
 - conditionally loading test deps (not on RHEL) (jomara at redhat.com)