From 217c3f4ce52ec4d76ab7dbc3c1de8d8632b54b7b Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Mon, 18 Feb 2019 15:38:17 -0700 Subject: [PATCH] rpm: fix pyOpenSSL requirement for RHEL 8 On RHEL 7, this package is named "pyOpenSSL", but on RHEL 8, Fedora, and SUSE, it is named "python3-pyOpenSSL". Prior to this change, the RHEL conditional was applying to both RHEL 7 and 8, so we would fail to resolve the "pyOpenSSL" package dependency on RHEL 8. Update the RPM conditionals to use "pyOpenSSL" on RHEL 7 and "python3-pyOpenSSL" on all other distributions. Signed-off-by: Ken Dreyer --- ceph.spec.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ceph.spec.in b/ceph.spec.in index 7303651f349..230d80942f9 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -461,13 +461,16 @@ Requires: python%{_python_buildid}-cherrypy Requires: python%{_python_buildid}-jwt Requires: python%{_python_buildid}-routes Requires: python%{_python_buildid}-werkzeug -Requires: pyOpenSSL%{_python_buildid} %endif %if 0%{?suse_version} Requires: python%{_python_buildid}-CherryPy Requires: python%{_python_buildid}-PyJWT Requires: python%{_python_buildid}-Routes Requires: python%{_python_buildid}-Werkzeug +%endif +%if 0%{?rhel} == 7 +Requires: pyOpenSSL +%else Requires: python%{_python_buildid}-pyOpenSSL %endif %description mgr-dashboard -- 2.39.5