From: Nathan Cutler <ncutler@suse.com>
Date: Wed, 11 Apr 2018 17:27:14 +0000 (+0200)
Subject: build/ops: rpm: move sgdisk-providing dep to ceph-base
X-Git-Tag: v12.2.10~20^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3e5e483f7354c51f6a5f4b806f0db4a694c1a878;p=ceph.git

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 <ncutler@suse.com>
(cherry picked from commit e23a12c2cb90ebe93f7c02cf8e98ff99fc34fd3f)

Conflicts:
	ceph.spec.in
- trivial resolution
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 443e5836a7a2..fca6af40a454 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -259,8 +259,12 @@ Requires:      cryptsetup
 Requires:      findutils
 Requires:      psmisc
 Requires:      which
+%if 0%{?fedora} || 0%{?rhel}
+Requires:      gdisk
+%endif
 %if 0%{?suse_version}
 Recommends:    ntp-daemon
+Requires:      gptfdisk
 %endif
 %description base
 Base is the package that includes all the files shared amongst ceph servers
@@ -428,13 +432,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