From e23a12c2cb90ebe93f7c02cf8e98ff99fc34fd3f Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Wed, 11 Apr 2018 19:27:14 +0200 Subject: [PATCH] build/ops: rpm: move sgdisk-providing dep to ceph-base In Debian "gdisk" is already listed under ceph-base, so this commit is RPM-only. sgdisk is only used by ceph-disk (part of "ceph-base"), not by ceph-volume (part of "ceph-osd") Fixes: http://tracker.ceph.com/issues/23657 Signed-off-by: Nathan Cutler --- ceph.spec.in | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index d4f4268ec4bd..b901dc218fd9 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -296,8 +296,12 @@ Requires: python%{_python_buildid}-setuptools Requires: util-linux Requires: xfsprogs Requires: which +%if 0%{?fedora} || 0%{?rhel} +Requires: gdisk +%endif %if 0%{?suse_version} Recommends: chrony +Requires: gptfdisk %endif %description base Base is the package that includes all the files shared amongst ceph servers @@ -469,13 +473,6 @@ Summary: Ceph Object Storage Daemon Group: System/Filesystems %endif Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} -# for sgdisk, used by ceph-disk -%if 0%{?fedora} || 0%{?rhel} -Requires: gdisk -%endif -%if 0%{?suse_version} -Requires: gptfdisk -%endif Requires: parted Requires: lvm2 %description osd -- 2.47.3