openstack/rpm-packaging
Code Issues Proposed changes

Install the pyc as well for the filelist capturing it

Browse Source 
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
This commit is contained in:
Dirk Mueller 2019-07-22 09:49:23 +02:00 committed by Thomas Bechtold
parent a008eb2094
commit d233b4642d
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack/freezer-web-ui/freezer-web-ui.spec.j2
View File

@ -45,7 +45,7 @@ The Freezer UI Horizon plugin adds Freezer panel to the OpenStack dashboard.
%py3_install %py3_install
install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ 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}%{python2_sitelib}
%fdupes %{buildroot}%{http_dashboard_dir} %fdupes %{buildroot}%{http_dashboard_dir}

2
openstack/monasca-ui/monasca-ui.spec.j2
View File

@ -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/enabled/
install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/conf/ 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/ cp -a monitoring/conf/monitoring_policy.json %{buildroot}%{http_dashboard_dir}/openstack_dashboard/conf/
%if 0%{?suse_version} %if 0%{?suse_version}
install -m 0755 -d %{buildroot}%{_datadir}/grafana/public/dashboards/ install -m 0755 -d %{buildroot}%{_datadir}/grafana/public/dashboards/

7
openstack/murano-dashboard/murano-dashboard.spec.j2
View File

@ -56,7 +56,7 @@ The Murano UI Horizon plugin adds Murano panel to the OpenStack dashboard.
%py3_install %py3_install
install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ 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/ 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 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/ 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 %files
%doc ChangeLog CONTRIBUTING.rst README.rst %doc ChangeLog CONTRIBUTING.rst README.rst
%license LICENSE %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/local/local_settings.d/_50_murano.py.example
%{http_dashboard_dir}/openstack_dashboard/conf/murano_policy.json %{http_dashboard_dir}/openstack_dashboard/conf/murano_policy.json

4
openstack/neutron-fwaas-dashboard/neutron-fwaas-dashboard.spec.j2
View File

@ -82,7 +82,7 @@ PYTHONPATH=%{http_dashboard_dir} python3 manage.py test neutron_fwaas_dashboard
%{py3_install} %{py3_install}
install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ 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/ 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/ 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 %files
%doc ChangeLog CONTRIBUTING.rst README.rst %doc ChangeLog CONTRIBUTING.rst README.rst
%license LICENSE %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 %{http_dashboard_dir}/openstack_dashboard/conf/neutron-fwaas-policy.json
%files -n {{ py2pkg('horizon-plugin-neutron-fwaas-ui') }} %files -n {{ py2pkg('horizon-plugin-neutron-fwaas-ui') }}

4
openstack/neutron-vpnaas-dashboard/neutron-vpnaas-dashboard.spec.j2
View File

@ -76,7 +76,7 @@ PYTHONPATH=%{http_dashboard_dir} python3 manage.py test neutron_vpnaas_dashboard
%{py3_install} %{py3_install}
install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ 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}%{python3_sitelib}
%fdupes %{buildroot}%{http_dashboard_dir} %fdupes %{buildroot}%{http_dashboard_dir}
@ -90,7 +90,7 @@ su %{apache_user} -s /bin/sh -c "python3 %{http_dashboard_dir}/manage.py collect
%files %files
%doc ChangeLog CONTRIBUTING.rst README.rst %doc ChangeLog CONTRIBUTING.rst README.rst
%license LICENSE %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') }} %files -n {{ py2pkg('horizon-plugin-neutron-vpnaas-ui') }}
%doc README.rst %doc README.rst