From 45ede095e2cf81830a090e58b68e6e3414790591 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Sat, 27 Feb 2016 00:02:00 +0100 Subject: [PATCH] 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 --- ceph.spec.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index d2218ab1457f..c0bd7a2a31a3 100644 --- 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 -- 2.47.3