From c1083b2f4f16ba910ef00705e615174e55a53b16 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 30 Nov 2018 13:11:13 +0100 Subject: [PATCH] build/ops: rpm: make ceph-grafana-dashboards own its directories on SUSE This is only required to get the spec file to build in the OpenSUSE Build Service (OBS). Also, this change could potentially make the package impossible to install together with grafana (if the latter owns the same directories with different ownership/permissions). Therefore, make the change specific to SUSE. Fixes: http://tracker.ceph.com/issues/37485 Signed-off-by: Nathan Cutler Signed-off-by: Tim Serong --- ceph.spec.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ceph.spec.in b/ceph.spec.in index 4929d08341c..4342d79b5a5 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -2014,7 +2014,13 @@ exit 0 %endif %files grafana-dashboards +%if 0%{?suse_version} +%attr(0750,root,grafana) %dir %{_sysconfdir}/grafana +%attr(0750,root,grafana) %dir %{_sysconfdir}/grafana/dashboards +%attr(0750,root,grafana) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard +%else %attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard +%endif %config %{_sysconfdir}/grafana/dashboards/ceph-dashboard/* %doc monitoring/grafana/dashboards/README %doc monitoring/grafana/README.md -- 2.39.5