Skip to content

Commit

Permalink
Merge pull request ceph#8137 from ceph/wip-15146-ceph-dep
Browse files Browse the repository at this point in the history
rpm: remove sub-package dependencies on "ceph"

Reviewed-by: Boris Ranto <[email protected]>
Reviewed-by: Nathan Cutler <[email protected]>
Reviewed-by: Jun Huang <[email protected]>
Reviewed-by: Kefu Chai <[email protected]>
Reviewed-by: Ali Maredia <[email protected]>
  • Loading branch information
b-ranto committed Mar 18, 2016
2 parents 2cf3f96 + fe6dc35 commit 97b709c
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions ceph.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -314,14 +314,12 @@ of cluster membership, configuration, and state.
%package fuse
Summary: Ceph fuse-based client
Group: System Environment/Base
Requires: %{name}
%description fuse
FUSE based client for Ceph distributed network file system

%package -n rbd-fuse
Summary: Ceph fuse-based client
Group: System Environment/Base
Requires: %{name}
Requires: librados2 = %{epoch}:%{version}-%{release}
Requires: librbd1 = %{epoch}:%{version}-%{release}
%description -n rbd-fuse
Expand All @@ -330,7 +328,6 @@ FUSE based client to map Ceph rbd images to files
%package -n rbd-mirror
Summary: Ceph daemon for mirroring RBD images
Group: System Environment/Base
Requires: %{name}
Requires: ceph-common = %{epoch}:%{version}-%{release}
Requires: librados2 = %{epoch}:%{version}-%{release}
%description -n rbd-mirror
Expand All @@ -340,7 +337,6 @@ changes asynchronously.
%package -n rbd-nbd
Summary: Ceph RBD client base on NBD
Group: System Environment/Base
Requires: %{name}
Requires: librados2 = %{epoch}:%{version}-%{release}
Requires: librbd1 = %{epoch}:%{version}-%{release}
%description -n rbd-nbd
Expand Down Expand Up @@ -374,7 +370,7 @@ conjunction with any FastCGI capable web server.
Summary: OCF-compliant resource agents for Ceph daemons
Group: System Environment/Base
License: LGPL-2.0
Requires: %{name} = %{epoch}:%{version}
Requires: ceph-base = %{epoch}:%{version}
Requires: resource-agents
%description resource-agents
Resource agents for monitoring and managing Ceph daemons
Expand Down Expand Up @@ -597,7 +593,7 @@ This package contains the Java libraries for the Ceph File System.
%package selinux
Summary: SELinux support for Ceph MON, OSD and MDS
Group: System Environment/Base
Requires: %{name}
Requires: ceph-base = %{epoch}:%{version}-%{release}
Requires: policycoreutils, libselinux-utils
Requires(post): selinux-policy-base >= %{_selinux_policy_version}, policycoreutils, gawk
Requires(postun): policycoreutils
Expand Down Expand Up @@ -634,7 +630,6 @@ Summary: Compatibility package for Ceph headers
Group: Development/Libraries
License: LGPL-2.0
Obsoletes: ceph-devel
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: librados2-devel = %{epoch}:%{version}-%{release}
Requires: libradosstriper1-devel = %{epoch}:%{version}-%{release}
Requires: librbd1-devel = %{epoch}:%{version}-%{release}
Expand Down

0 comments on commit 97b709c

Please sign in to comment.