Skip to content

Commit

Permalink
ceph.spec.in: move ceph-disk runtime dependency to ceph-osd
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
smithfarm committed Feb 26, 2016
1 parent f8d1df8 commit 01e30fb
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions ceph.spec.in
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 01e30fb

Please sign in to comment.