From 78b63fc82f971aae419dbd921f0560c09be1bcd1 Mon Sep 17 00:00:00 2001 From: FFrog Date: Thu, 18 Nov 2021 21:00:30 +0800 Subject: [PATCH] fix the file path (cherry picked from commit 85551342d966296d5c24ab2d2ed0ad2073819592) --- openstack-dashboard.spec | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/openstack-dashboard.spec b/openstack-dashboard.spec index 0db27eb..2f7d8bc 100644 --- a/openstack-dashboard.spec +++ b/openstack-dashboard.spec @@ -1,7 +1,7 @@ %{!?upstream_version: %global upstream_version %{version}%{?milestone}} Name: openstack-dashboard Version: 16.2.2 -Release: 1 +Release: 2 Summary: OpenStack Dashboard (Horizon) License: Apache-2.0 and BSD URL: http://horizon.openstack.org/ @@ -239,9 +239,9 @@ find %{buildroot} -name djangojs.po -exec rm '{}' \; mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.py.example %{buildroot}%{_sysconfdir}/openstack-dashboard/local_settings ln -s ../../../../..%{_sysconfdir}/openstack-dashboard/local_settings %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.py -mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/conf/default_policies %{buildroot}%{_sysconfdir}/openstack-dashboard -mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/conf/*.yaml %{buildroot}%{_sysconfdir}/openstack-dashboard +mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/conf/*.json %{buildroot}%{_sysconfdir}/openstack-dashboard mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/conf/nova_policy.d %{buildroot}%{_sysconfdir}/openstack-dashboard +rm -rf %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/wsgi %find_lang django --all-name @@ -323,13 +323,11 @@ systemctl daemon-reload >/dev/null 2>&1 || : %dir %attr(0750, apache, apache) %{_var}/log/horizon %config(noreplace) %{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf %config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/local_settings -%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/default_policies/*.yaml -%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/default_policies/README.txt -%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/cinder_policy.yaml -%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/keystone_policy.yaml -%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/nova_policy.yaml -%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/glance_policy.yaml -%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/neutron_policy.yaml +%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/cinder_policy.json +%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/keystone_policy.json +%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/nova_policy.json +%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/glance_policy.json +%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/neutron_policy.json %config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/nova_policy.d/api-extensions.yaml %config(noreplace) %attr(0644, root, root) %{_sysconfdir}/logrotate.d/openstack-dashboard %attr(755,root,root) %dir %{_unitdir}/httpd.service.d @@ -345,5 +343,8 @@ systemctl daemon-reload >/dev/null 2>&1 || : %{python3_sitelib}/openstack_auth %changelog +* Fri Nov 19 2021 lijiawei - 16.2.2-2 +- Fix the file path + * Fri Nov 05 2021 lijiawei - 16.2.2-1 - Support OpenStack Train release