summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ceph.spec.in11
1 files changed, 8 insertions, 3 deletions
diff --git a/ceph.spec.in b/ceph.spec.in
index afee3314289..2d0a90386fe 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -315,6 +315,11 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/ceph/mds
mkdir -p $RPM_BUILD_ROOT/var/lib/ceph/bootstrap-osd
mkdir -p $RPM_BUILD_ROOT/var/lib/ceph/bootstrap-mds
+# Makefile puts these in sbin, but we want to package them in usr/sbin
+mv -f $RPM_BUILD_ROOT/sbin/ceph-disk-activate $RPM_BUILD_ROOT/usr/sbin/ceph-disk-activate
+mv -f $RPM_BUILD_ROOT/sbin/ceph-disk-prepare $RPM_BUILD_ROOT/usr/sbin/ceph-disk-prepare
+mv -f $RPM_BUILD_ROOT/sbin/ceph-create-keys $RPM_BUILD_ROOT/usr/sbin/ceph-create-keys
+
%if %{defined suse_version}
# Fedora seems to have some problems with this macro, use it only on SUSE
%fdupes -s $RPM_BUILD_ROOT/%{python_sitelib}
@@ -434,9 +439,9 @@ fi
%{_libdir}/rados-classes/libcls_lock.so*
%{_libdir}/rados-classes/libcls_kvs.so*
%{_libdir}/rados-classes/libcls_refcount.so*
-/sbin/ceph-disk-activate
-/sbin/ceph-disk-prepare
-/sbin/ceph-create-keys
+/usr/sbin/ceph-disk-activate
+/usr/sbin/ceph-disk-prepare
+/usr/sbin/ceph-create-keys
/lib/udev/rules.d/95-ceph-osd.rules
#set up placeholder directories