build/ops: move parted runtime dependency to ceph-base

Since ceph-disk has been moved from "ceph-osd" to "ceph-base", all of
ceph-disk's dependencies should also be moved, provided they are not
needed by anything else.

Fixes: http://tracker.ceph.com/issues/23657
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit acf6423cf6c6a47dbf59a99052a227c229d47004)

Conflicts:
	ceph.spec.in
- trivial resolution

diff --git a/ceph.spec.in b/ceph.spec.in
index fca6af40a454b2bbd6315ed3830f97a3fb1c44d0..84cbad697439c4cacd45fdc4fc6c316f8bd5c68e 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -254,6 +254,7 @@ Requires:      grep
 Requires:      xfsprogs
 Requires:      e2fsprogs
 Requires:      logrotate
+Requires:      parted
 Requires:      util-linux
 Requires:      cryptsetup
 Requires:      findutils
@@ -432,7 +433,6 @@ Summary:    Ceph Object Storage Daemon
 Group:         System/Filesystems
 %endif
 Requires:      ceph-base = %{_epoch_prefix}%{version}-%{release}
-Requires:      parted
 Requires:      lvm2
 %description osd
 ceph-osd is the object storage daemon for the Ceph distributed file

diff --git a/debian/control b/debian/control
index f6c953851492d048d77f044f0a85f98b83168c2a..6d01e31154a759768045bc69fdea0d52926a5212 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -93,6 +93,7 @@ Depends: binutils,
          gdisk,
          grep,
          logrotate,
+         parted,
          psmisc,
          xfsprogs,
          ${misc:Depends},
@@ -236,7 +237,6 @@ Description: debugging symbols for ceph-mon
 Package: ceph-osd
 Architecture: linux-any
 Depends: ceph-base (= ${binary:Version}),
-         parted,
          lvm2,
          ${misc:Depends},
          ${python:Depends},