From: Ken Dreyer <kdreyer@redhat.com>
Date: Wed, 10 Jun 2015 21:43:41 +0000 (-0600)
Subject: ceph.spec.in: package mkcephfs on EL6
X-Git-Tag: v0.80.10~4^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F4924%2Fhead;p=ceph.git

ceph.spec.in: package mkcephfs on EL6

Commit efbca0465c2946e113771966df08cf7cf37b1196 added mkcephfs to the
RPM %files listing, but this /usr/sbin path is only correct for CentOS
7. In CentOS 6, the utility is present at /sbin/mkcephfs instead. This
causes rpmbuild to fail to build the tip of the firefly branch on EL6.

Adjust the RPM %files list so we properly package mkcephfs on both EL7
and EL6.

http://tracker.ceph.com/issues/11955 Refs: #11955

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 5380a58547c..b1372aa422a 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -448,10 +448,11 @@ fi
 %{_sbindir}/ceph-disk-udev
 %{_sbindir}/ceph-create-keys
 %{_sbindir}/rcceph
-%{_sbindir}/mkcephfs
 %if 0%{?rhel} >= 7 || 0%{?fedora}
+%{_sbindir}/mkcephfs
 %{_sbindir}/mount.ceph
 %else
+/sbin/mkcephfs
 /sbin/mount.ceph
 %endif
 %dir %{_libdir}/ceph