From e1c35812d111ef07dd336471d61b78acf9dff93a Mon Sep 17 00:00:00 2001 From: Gary Lowell Date: Tue, 19 Mar 2013 11:28:15 -0700 Subject: ceph.spec.in: Move three scripts from sbin to usr/bin The ceph-create-keys, ceph-disk-activate, and ceph-disk-prepare scripts are built in sbin, but debian installs them into usr/bin, and several utilities look for them there. This commit changes the RPM to install them in /usr/bin. (Bug #3921) Signed-off-by: Gary Lowell --- ceph.spec.in | 11 ++++++++--- 1 file 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 -- cgit v1.2.1