From 904650262cb9c928593b18b1e3151485b89abc0b Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 18 Dec 2019 15:00:49 +0800 Subject: [PATCH] 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 --- ceph.spec.in | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 1a298114e2f53..6b74cad1da8d1 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 -- 2.39.5