From: Kefu Chai <kchai@redhat.com>
Date: Thu, 24 Jun 2021 03:06:31 +0000 (+0800)
Subject: ceph.spec.in: move "Requires: python3-setuptools" from ceph-base to ceph-osd
X-Git-Tag: v17.1.0~1537^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=99eec32343731add1bed920819c79756947434a4;p=ceph-ci.git

ceph.spec.in: move "Requires: python3-setuptools" from ceph-base to ceph-osd

python3-setuptools was originally added to ceph-base as a dependency of
ceph-detect-init, see https://tracker.ceph.com/issues/14864. but since
ceph-disk and ceph-detect-init were replaced by ceph-volume, and were
removed from the debian packaging in
ee6bc23e892369b14668faea04c3ef1b5776a6b6.

there is no need to have python3-setuptools in the ceph-base packages
anymore.

but since we are still using pkg_resources module provided by setuptools
in ceph-volume, we need to preserve this runtime dependency in ceph-osd.
as ceph-osd packages ceph-volume.

please note, pkg_resources module is also used by cephadm to poke around
ceph_iscsi python module installed in a container, so python-setuptools
should be installed along with ceph-iscsi if we need a better
interoperability between ceph-iscsi and cephadm. this is not in the
scope of this change.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 7bc9b599d4e..b70ced59079 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -450,7 +450,6 @@ Requires:      grep
 Requires:      logrotate
 Requires:      parted
 Requires:      psmisc
-Requires:      python%{python3_pkgversion}-setuptools
 Requires:      util-linux
 Requires:      xfsprogs
 Requires:      which
@@ -810,6 +809,8 @@ Requires:	lvm2
 Requires:	sudo
 Requires:	libstoragemgmt
 Requires:	python%{python3_pkgversion}-ceph-common = %{_epoch_prefix}%{version}-%{release}
+Requires:	python%{python3_pkgversion}-setuptools
+
 %if 0%{?weak_deps}
 Recommends:	nvme-cli
 %if 0%{?suse_version}