]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: always depends on python3.6-pyOpenSSL 32317/head
authorKefu Chai <kchai@redhat.com>
Wed, 18 Dec 2019 07:00:49 +0000 (15:00 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 18 Dec 2019 07:01:27 +0000 (15:01 +0800)
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>
ceph.spec.in

index 1a298114e2f53d90423a775234d03e7267ec924d..6b74cad1da8d1351da77d3e97d2b03379265f1d7 100644 (file)
@@ -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