ceph.spec.in: move ceph-disk runtime dependency to ceph-osd

ceph-disk uses sgdisk, which resides in the gdisk and gptfdisk packages on
RHEL and SUSE derivatives, respectively.

ceph-disk is included in the ceph-osd package, so the sgdisk dependency
belongs there.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index d2218ab1457f36531c2847872e0d9866f3e53a62..c0bd7a2a31a3cad7e61439c50915cd3a1c6e4668 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -152,12 +152,9 @@ BuildRequires:     systemd
 PreReq:                %fillup_prereq
 BuildRequires: net-tools
 BuildRequires: libbz2-devel
-%if 0%{?suse_version}
-Requires:      gptfdisk
 %if 0%{with tcmalloc}
 BuildRequires: gperftools-devel
 %endif
-%endif
 BuildRequires: mozilla-nss-devel
 BuildRequires: keyutils-devel
 BuildRequires: libatomic-ops-devel
@@ -168,7 +165,6 @@ Requires:   systemd
 BuildRequires: nss-devel
 BuildRequires: keyutils-libs-devel
 BuildRequires: libatomic_ops-devel
-Requires:      gdisk
 Requires(post):        chkconfig
 Requires(preun):       chkconfig
 Requires(preun):       initscripts
@@ -365,6 +361,13 @@ managers such as Pacemaker.
 Summary:       Ceph Object Storage Daemon
 Group:         System Environment/Base
 Requires:      ceph-base = %{epoch}:%{version}-%{release}
+# for sgdisk, used by ceph-disk
+%if 0%{?fedora} || 0%{?rhel}
+Requires:      gdisk
+%endif
+%if 0%{?suse_version}
+Requires:      gptfdisk
+%endif
 %description osd
 ceph-osd is the object storage daemon for the Ceph distributed file
 system.  It is responsible for storing objects on a local file system