From: Kefu Chai <kchai@redhat.com>
Date: Wed, 19 Feb 2020 16:47:42 +0000 (+0800)
Subject: ceph.spec.in: update to adapt to el7
X-Git-Tag: v15.1.1~333^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6cfd31cdbb3fc79acffafc13276aeb23c368ea59;p=ceph.git

ceph.spec.in: update to adapt to el7

make sure ceph-mgr installs on el7

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

diff --git a/ceph.spec.in b/ceph.spec.in
index 18542f83fddf..9c9e001958a2 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -205,12 +205,13 @@ BuildRequires:	libuuid-devel
 %if 0%{?rhel} == 7
 BuildRequires:	python%{python3_version_nodots}-bcrypt
 BuildRequires:	python%{python3_version_nodots}-nose
+BuildRequires:	python%{python3_version_nodots}-requests
 %else
 BuildRequires:	python%{python3_pkgversion}-bcrypt
 BuildRequires:	python%{python3_pkgversion}-nose
 BuildRequires:	python%{python3_pkgversion}-pecan
-%endif
 BuildRequires:	python%{python3_pkgversion}-requests
+%endif
 %if 0%{?rhel} == 7
 BuildRequires:	python%{python3_version_nodots}-six
 BuildRequires:	python%{python3_version_nodots}-virtualenv
@@ -486,11 +487,19 @@ Summary:        Ceph Manager Daemon
 Group:          System/Filesystems
 %endif
 Requires:       ceph-base = %{_epoch_prefix}%{version}-%{release}
+%if 0%{?rhel} == 7
+Requires:       python%{python3_version_nodots}-bcrypt
+Requires:       python%{python3_version_nodots}-pyOpenSSL
+Requires:       python%{python3_version_nodots}-requests
+Requires:       python%{python3_version_nodots}-six
+%else
 Requires:       python%{python3_pkgversion}-bcrypt
 Requires:       python%{python3_pkgversion}-pecan
+Requires:       python%{python3_pkgversion}-pyOpenSSL
 Requires:       python%{python3_pkgversion}-requests
 Requires:       python%{python3_pkgversion}-six
-%if 0%{?fedora} || 0%{?rhel}
+%endif
+%if 0%{?fedora} || 0%{?rhel} >= 8
 Requires:       python%{python3_pkgversion}-cherrypy
 Requires:       python%{python3_pkgversion}-werkzeug
 %if 0%{?rhel} == 7
@@ -513,7 +522,6 @@ Recommends:	ceph-mgr-k8sevents = %{_epoch_prefix}%{version}-%{release}
 Recommends:	ceph-mgr-cephadm = %{_epoch_prefix}%{version}-%{release}
 Recommends:	python%{python3_pkgversion}-influxdb
 %endif
-Requires:       python%{python3_pkgversion}-pyOpenSSL
 %description mgr
 ceph-mgr enables python modules that provide services (such as the REST
 module derived from Calamari) and expose CLI hooks.  ceph-mgr gathers