From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Thu, 4 Apr 2013 13:58:12 +0000 (+0200)
Subject: ceph.spec.in: don't move ceph-disk* and ceph-create-keys around
X-Git-Tag: v0.62~88^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=61a2be3bb60145ba6aef91b8b2645a1f48f7de85;p=ceph.git

ceph.spec.in: don't move ceph-disk* and ceph-create-keys around

Don't move these files around, they get installed now directly to
%{_sbindir}.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 266e22e9601a..a76b21c14d0e 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -316,11 +316,6 @@ 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 $RPM_BUILD_ROOT%{_sbindir}/ceph-disk
-mv -f $RPM_BUILD_ROOT/sbin/ceph-disk-activate $RPM_BUILD_ROOT%{_sbindir}/ceph-disk-activate
-mv -f $RPM_BUILD_ROOT/sbin/ceph-disk-prepare $RPM_BUILD_ROOT%{_sbindir}/ceph-disk-prepare
-mv -f $RPM_BUILD_ROOT/sbin/ceph-create-keys $RPM_BUILD_ROOT%{_sbindir}/ceph-create-keys
 
 %if %{defined suse_version}
 # Fedora seems to have some problems with this macro, use it only on SUSE