Merge pull request ceph#9415 from ceph/wip-16095-parted

packaging: move parted requirement to -osd subpkg Reviewed-by: Nathan Cutler <[email protected]> Reviewed-by: Boris Ranto <[email protected]>
siplabs · Jun 1, 2016 · 7b93841 · 7b93841
2 parents db353c1 + 1153496
commit 7b93841
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/ceph.spec.in b/ceph.spec.in
@@ -205,7 +205,6 @@ Requires:      python-setuptools
 Requires:      grep
 Requires:      xfsprogs
 Requires:      logrotate
-Requires:      parted
 Requires:      util-linux
 Requires:      hdparm
 Requires:      cryptsetup
@@ -344,6 +343,7 @@ Requires:	gdisk
 %if 0%{?suse_version}
 Requires:	gptfdisk
 %endif
+Requires:       parted
 %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

diff --git a/debian/control b/debian/control
@@ -91,7 +91,6 @@ Depends: binutils,
          grep,
          logrotate,
          lsb-release,
-         parted,
          python,
          python-argparse | libpython2.7-stdlib,
          python-pkg-resources,
@@ -180,7 +179,10 @@ Description: debugging symbols for ceph-mon
 
 Package: ceph-osd
 Architecture: linux-any
-Depends: ceph-base (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: ceph-base (= ${binary:Version}),
+         parted,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: ceph-common (= ${binary:Version})
 Replaces: ceph (<< 10)
 Breaks: ceph (<< 10)