From: Kefu Chai <kchai@redhat.com>
Date: Wed, 18 Dec 2019 07:00:49 +0000 (+0800)
Subject: ceph.spec.in: always depends on python3.6-pyOpenSSL
X-Git-Tag: v15.1.0~444^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32317%2Fhead;p=ceph.git

ceph.spec.in: always depends on python3.6-pyOpenSSL

since we've moved to py3-only world, there is no need to depend on
pyOpenSSL anymore.

also, _python_buildid was removed in
3bf8b4d7d6012458fc761edd759a4fb3070a30fe .

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

diff --git a/ceph.spec.in b/ceph.spec.in
index 1a298114e2f..6b74cad1da8 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -288,11 +288,7 @@ BuildRequires:	xmlsec1-devel
 BuildRequires:	xmlsec1-nss
 BuildRequires:	xmlsec1-openssl
 BuildRequires:	xmlsec1-openssl-devel
-%if 0%{?rhel} == 7
-BuildRequires:  pyOpenSSL%{_python_buildid}
-%else
-BuildRequires:  python%{_python_buildid}-pyOpenSSL
-%endif
+BuildRequires:  python%{python3_pkgversion}-pyOpenSSL
 %endif
 %endif
 %if 0%{?suse_version}
@@ -479,11 +475,7 @@ Recommends:	ceph-mgr-k8sevents = %{_epoch_prefix}%{version}-%{release}
 Recommends:	ceph-mgr-cephadm = %{_epoch_prefix}%{version}-%{release}
 Recommends:	python%{python3_pkgversion}-influxdb
 %endif
-%if 0%{?rhel} == 7
-Requires:       pyOpenSSL
-%else
 Requires:       python%{python3_pkgversion}-pyOpenSSL
-%endif
 %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