ceph.spec.in: systemd-related mods to ceph and ceph-common %files

without introducing duplicate %{_initrddir}/ceph

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 897815774b2c8eb76503628ff3b82092b24effed)

Conflicts:
	ceph.spec.in
            refrain from duplicating %{_sbindir}/rcceph

diff --git a/ceph.spec.in b/ceph.spec.in
index 2b4d051787ca540dbd05013f56d69a52e878ef28..85b9491647680df66f35b4ec1187faf21832503e 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -703,9 +703,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/cephfs-table-tool
 %{_bindir}/ceph-debugpack
 %{_bindir}/ceph-coverage
-%{_initrddir}/ceph
 %if 0%{?_with_systemd}
+%{_libexecdir}/ceph/ceph-osd-prestart.sh
+%{_unitdir}/ceph-osd@.service
+%{_unitdir}/ceph-mon@.service
+%{_unitdir}/ceph-mds@.service
+%{_unitdir}/ceph.target
 %{_tmpfilesdir}/%{name}.conf
+%else
+%{_initrddir}/ceph
 %endif
 %{_sbindir}/ceph-disk
 %{_sbindir}/ceph-disk-activate
@@ -805,7 +811,9 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/bash_completion.d/rados
 %config %{_sysconfdir}/bash_completion.d/rbd
 %config(noreplace) %{_sysconfdir}/ceph/rbdmap
+%if ! 0%{?_with_systemd}
 %{_initrddir}/rbdmap
+%endif
 %{python_sitelib}/ceph_argparse.py*
 %{_udevrulesdir}/50-rbd.rules