From: Nathan Cutler <ncutler@suse.com>
Date: Fri, 30 Nov 2018 12:11:13 +0000 (+0100)
Subject: build/ops: rpm: make ceph-grafana-dashboards own its directories on SUSE
X-Git-Tag: v14.1.0~688^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F25347%2Fhead;p=ceph.git

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 <ncutler@suse.com>
Signed-off-by: Tim Serong <tserong@suse.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 4929d08341c9..4342d79b5a5b 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