From: Tim Serong <tserong@suse.com>
Date: Fri, 10 Dec 2021 07:43:25 +0000 (+1100)
Subject: ceph.spec.in: fix mgr-cephadm CherryPy requirement for SUSE builds
X-Git-Tag: v17.1.0~231^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=eca838dfab25fa7630409cefa4c3a7a3e42eab12;p=ceph-ci.git

ceph.spec.in: fix mgr-cephadm CherryPy requirement for SUSE builds

Commit 78983ad0d0c added cherrypy to ceph-mgr-cephadm's Requires,
but this needs to be split out into distro-specific sections due
to subtle/irritating naming differences.

Fixes: 78983ad0d0cce422da32dc4876ac186f6d32c3f5
Signed-off-by: Tim Serong <tserong@suse.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 3579d7e628e..c02aa54fca4 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -662,14 +662,15 @@ Group:          System/Filesystems
 %endif
 Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
 Requires:       python%{python3_pkgversion}-asyncssh
-Requires:       python%{python3_pkgversion}-cherrypy
 Requires:       cephadm = %{_epoch_prefix}%{version}-%{release}
 %if 0%{?suse_version}
 Requires:       openssh
+Requires:       python%{python3_pkgversion}-CherryPy
 Requires:       python%{python3_pkgversion}-Jinja2
 %endif
 %if 0%{?rhel} || 0%{?fedora}
 Requires:       openssh-clients
+Requires:       python%{python3_pkgversion}-cherrypy
 Requires:       python%{python3_pkgversion}-jinja2
 %endif
 %description mgr-cephadm