From: Nathan Cutler <ncutler@suse.com>
Date: Mon, 29 Feb 2016 16:32:50 +0000 (+0100)
Subject: RPM: drop duplicate /var/lib/ceph/* directories
X-Git-Tag: v10.0.4~5^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7826%2Fhead;p=ceph.git

RPM: drop duplicate /var/lib/ceph/* directories

As of a recent commit, we had /var/lib/ceph/{mds,mon,osd} directories
packaged twice, once with %attr and once without. Drop the latter.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index a5c3c292e935..d3e9cc0bd84a 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1019,7 +1019,6 @@ fi
 %else
 %{_initrddir}/ceph
 %endif
-%dir %{_localstatedir}/lib/ceph/mds
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mds
 
 %files mon
@@ -1027,7 +1026,6 @@ fi
 %{_bindir}/ceph-rest-api
 %{_mandir}/man8/ceph-mon.8*
 %{_mandir}/man8/ceph-rest-api.8*
-%dir %{_localstatedir}/lib/ceph/mon
 %{python_sitelib}/ceph_rest_api.py*
 %if 0%{?_with_systemd}
 %{_unitdir}/ceph-mon@.service
@@ -1148,7 +1146,6 @@ fi
 %else
 %{_initrddir}/ceph
 %endif
-%dir %{_localstatedir}/lib/ceph/osd
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/osd
 
 #################################################################################