From d233b4642d11b0abd9e02b04643e2f8209ed92e9 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 22 Jul 2019 09:49:23 +0200 Subject: [PATCH] Install the pyc as well for the filelist capturing it The change in Ib03f38285c3de377d4c71de4ed7feb1bfa919a35 was actually incomplete, it updated the filelist but never actually instaled the additional files, so they were not included. Change-Id: Ibb3cbfc6c940ba5a436fcb13e8d9200e647acc78 --- openstack/freezer-web-ui/freezer-web-ui.spec.j2 | 2 +- openstack/monasca-ui/monasca-ui.spec.j2 | 2 +- openstack/murano-dashboard/murano-dashboard.spec.j2 | 7 +++++-- .../neutron-fwaas-dashboard.spec.j2 | 4 ++-- .../neutron-vpnaas-dashboard.spec.j2 | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/openstack/freezer-web-ui/freezer-web-ui.spec.j2 b/openstack/freezer-web-ui/freezer-web-ui.spec.j2 index 24dc40c61..c1729cc30 100644 --- a/openstack/freezer-web-ui/freezer-web-ui.spec.j2 +++ b/openstack/freezer-web-ui/freezer-web-ui.spec.j2 @@ -45,7 +45,7 @@ The Freezer UI Horizon plugin adds Freezer panel to the OpenStack dashboard. %py3_install install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ -cp -a disaster_recovery/enabled/_50*.py %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ +cp -a disaster_recovery/enabled/_50*.py* %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ %fdupes %{buildroot}%{python2_sitelib} %fdupes %{buildroot}%{http_dashboard_dir} diff --git a/openstack/monasca-ui/monasca-ui.spec.j2 b/openstack/monasca-ui/monasca-ui.spec.j2 index 133355d28..e059bac97 100644 --- a/openstack/monasca-ui/monasca-ui.spec.j2 +++ b/openstack/monasca-ui/monasca-ui.spec.j2 @@ -61,7 +61,7 @@ panel's Alarms tab links to when generating drilldown links for alarms. install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/conf/ -cp -a monitoring/enabled/_50_admin_add_monitoring_panel.py %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ +cp -a monitoring/enabled/_50_admin_add_monitoring_panel.py* %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ cp -a monitoring/conf/monitoring_policy.json %{buildroot}%{http_dashboard_dir}/openstack_dashboard/conf/ %if 0%{?suse_version} install -m 0755 -d %{buildroot}%{_datadir}/grafana/public/dashboards/ diff --git a/openstack/murano-dashboard/murano-dashboard.spec.j2 b/openstack/murano-dashboard/murano-dashboard.spec.j2 index e5dfd3436..bf15d442c 100644 --- a/openstack/murano-dashboard/murano-dashboard.spec.j2 +++ b/openstack/murano-dashboard/murano-dashboard.spec.j2 @@ -56,7 +56,7 @@ The Murano UI Horizon plugin adds Murano panel to the OpenStack dashboard. %py3_install install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ -cp -a muranodashboard/local/enabled/*.py %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ +cp -a muranodashboard/local/enabled/*.py* %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/local/local_settings.d/ cp -a muranodashboard/local/local_settings.d/_50_murano.py %{buildroot}%{http_dashboard_dir}/openstack_dashboard/local/local_settings.d/_50_murano.py.example install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/conf/ @@ -74,7 +74,10 @@ su %{apache_user} -s /bin/sh -c "python3 %{http_dashboard_dir}/manage.py collect %files %doc ChangeLog CONTRIBUTING.rst README.rst %license LICENSE -%{http_dashboard_dir}/openstack_dashboard/enabled/*.py* +%{http_dashboard_dir}/openstack_dashboard/enabled/_5*.py* +%{http_dashboard_dir}/openstack_dashboard/enabled/_6*.py* +%{http_dashboard_dir}/openstack_dashboard/enabled/_7*.py* +%{http_dashboard_dir}/openstack_dashboard/enabled/_8*.py* %{http_dashboard_dir}/openstack_dashboard/local/local_settings.d/_50_murano.py.example %{http_dashboard_dir}/openstack_dashboard/conf/murano_policy.json diff --git a/openstack/neutron-fwaas-dashboard/neutron-fwaas-dashboard.spec.j2 b/openstack/neutron-fwaas-dashboard/neutron-fwaas-dashboard.spec.j2 index e7eb29d8b..878eda3f1 100644 --- a/openstack/neutron-fwaas-dashboard/neutron-fwaas-dashboard.spec.j2 +++ b/openstack/neutron-fwaas-dashboard/neutron-fwaas-dashboard.spec.j2 @@ -82,7 +82,7 @@ PYTHONPATH=%{http_dashboard_dir} python3 manage.py test neutron_fwaas_dashboard %{py3_install} install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ -cp -a neutron_fwaas_dashboard/enabled/*.py %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ +cp -a neutron_fwaas_dashboard/enabled/_70*.py* %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/conf/ cp -a etc/neutron-fwaas-policy.json %{buildroot}%{http_dashboard_dir}/openstack_dashboard/conf/ @@ -98,7 +98,7 @@ su %{apache_user} -s /bin/sh -c "python3 %{http_dashboard_dir}/manage.py collect %files %doc ChangeLog CONTRIBUTING.rst README.rst %license LICENSE -%{http_dashboard_dir}/openstack_dashboard/enabled/*.py* +%{http_dashboard_dir}/openstack_dashboard/enabled/_70*.py* %{http_dashboard_dir}/openstack_dashboard/conf/neutron-fwaas-policy.json %files -n {{ py2pkg('horizon-plugin-neutron-fwaas-ui') }} diff --git a/openstack/neutron-vpnaas-dashboard/neutron-vpnaas-dashboard.spec.j2 b/openstack/neutron-vpnaas-dashboard/neutron-vpnaas-dashboard.spec.j2 index 282c81b27..849d4b43a 100644 --- a/openstack/neutron-vpnaas-dashboard/neutron-vpnaas-dashboard.spec.j2 +++ b/openstack/neutron-vpnaas-dashboard/neutron-vpnaas-dashboard.spec.j2 @@ -76,7 +76,7 @@ PYTHONPATH=%{http_dashboard_dir} python3 manage.py test neutron_vpnaas_dashboard %{py3_install} install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ -cp -a neutron_vpnaas_dashboard/enabled/*.py %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ +cp -a neutron_vpnaas_dashboard/enabled/_71*.py* %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ %fdupes %{buildroot}%{python3_sitelib} %fdupes %{buildroot}%{http_dashboard_dir} @@ -90,7 +90,7 @@ su %{apache_user} -s /bin/sh -c "python3 %{http_dashboard_dir}/manage.py collect %files %doc ChangeLog CONTRIBUTING.rst README.rst %license LICENSE -%{http_dashboard_dir}/openstack_dashboard/enabled/*.py* +%{http_dashboard_dir}/openstack_dashboard/enabled/_71*.py* %files -n {{ py2pkg('horizon-plugin-neutron-vpnaas-ui') }} %doc README.rst