From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Tue, 18 Feb 2020 14:30:25 +0000 (+0100)
Subject: spec: ceph-mgr: add missing python3-pyyaml
X-Git-Tag: v15.1.1~365^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33387%2Fhead;p=ceph.git

spec: ceph-mgr: add missing python3-pyyaml

Remove stray req from the -k8events package, since the base ceph-mgr now
requires it.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 60befaee5a6f..99fd431d5525 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -493,10 +493,16 @@ Requires:       python%{python3_pkgversion}-six
 %if 0%{?fedora} || 0%{?rhel}
 Requires:       python%{python3_pkgversion}-cherrypy
 Requires:       python%{python3_pkgversion}-werkzeug
+%if 0%{?rhel} == 7
+Requires:       python%{python3_version_nodots}-PyYAML
+%else
+Requires:       python%{python3_pkgversion}-pyyaml
+%endif
 %endif
 %if 0%{?suse_version}
 Requires:       python%{python3_pkgversion}-CherryPy
 Requires:       python%{python3_pkgversion}-Werkzeug
+Requires:       python%{python3_pkgversion}-PyYAML
 %endif
 %if 0%{?weak_deps}
 Recommends:	ceph-mgr-dashboard = %{_epoch_prefix}%{version}-%{release}
@@ -601,12 +607,6 @@ Group:          System/Filesystems
 %endif
 Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
 Requires:       python%{python3_pkgversion}-kubernetes
-%if 0%{?fedora} || 0%{?rhel}
-Requires:       python%{python3_pkgversion}-yaml
-%endif
-%if 0%{?suse_version}
-Requires:       python%{python3_pkgversion}-PyYAML
-%endif
 %description mgr-k8sevents
 ceph-mgr-k8sevents is a ceph-mgr plugin that sends every ceph-events
 to kubernetes' events API