]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
build/ops: rpm: package COPYING, move conf example to ceph-common
authorNathan Cutler <ncutler@suse.com>
Fri, 9 Jun 2017 09:52:59 +0000 (11:52 +0200)
committerNathan Cutler <ncutler@suse.com>
Thu, 15 Jun 2017 11:30:52 +0000 (13:30 +0200)
Signed-off-by: Nathan Cutler <ncutler@suse.com>
ceph.spec.in

index 979c42ce765a5d9b0fa0e1075a7ec54b801abea1..277e376d7487cffdd563f7cb6662c96eaa6c3743 100644 (file)
@@ -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