From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 22 Oct 2020 05:50:37 +0000 (+0200)
Subject: rpm: move python-enum34 into rhel 7 conditional
X-Git-Tag: v14.2.13~3^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F37747%2Fhead;p=ceph.git

rpm: move python-enum34 into rhel 7 conditional

There is no "python-enum34" RPM in openSUSE 15.1 (as this release
uses Python 3 exclusively), so the dependency cannot be satisfied.

This nautilus-only change fixes a nautilus-only commit which broke
nautilus on openSUSE and SUSE Linux Enterprise.

Fixes: fdfae1c00c0059a03389bdcfafa6b0ee8d95ad55
Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 27ddb76f2430..8211ae7b4d86 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -478,12 +478,10 @@ Recommends:	python%{_python_buildid}-influxdb
 %endif
 %if 0%{?rhel} == 7
 Requires:       pyOpenSSL
+Requires:       python-enum34
 %else
 Requires:       python%{_python_buildid}-pyOpenSSL
 %endif
-%if 0%{?rhel} < 8 || 0%{?suse_version}
-Requires:       python-enum34
-%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