From: Nathan Cutler <ncutler@suse.com>
Date: Fri, 9 Jun 2017 09:52:59 +0000 (+0200)
Subject: build/ops: rpm: package COPYING, move conf example to ceph-common
X-Git-Tag: v12.1.0~114^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F15596%2Fhead;p=ceph.git

build/ops: rpm: package COPYING, move conf example to ceph-common

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

diff --git a/ceph.spec.in b/ceph.spec.in
index 979c42ce765..277e376d748 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -883,6 +883,7 @@ install -m 0644 -D systemd/50-ceph.preset %{buildroot}%{_libexecdir}/systemd/sys
 mkdir -p %{buildroot}%{_sbindir}
 install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph
 chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf
+install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING
 
 # firewall templates and /sbin/mount.ceph symlink
 %if 0%{?suse_version}
@@ -926,9 +927,6 @@ rm -rf %{buildroot}
 %files
 
 %files base
-%docdir %{_docdir}
-%dir %{_docdir}/ceph
-%{_docdir}/ceph/sample.ceph.conf
 %{_bindir}/crushtool
 %{_bindir}/monmaptool
 %{_bindir}/osdmaptool
@@ -1028,6 +1026,10 @@ if [ $FIRST_ARG -ge 1 ] ; then
 fi
 
 %files common
+%docdir %{_docdir}
+%docdir %{_docdir}/ceph
+%doc %{_docdir}/ceph/sample.ceph.conf
+%doc %{_docdir}/ceph/COPYING
 %{_bindir}/ceph
 %{_bindir}/ceph-authtool
 %{_bindir}/ceph-conf