spec: ceph-mgr: add missing python3-pyyaml 33387/head
authorSebastian Wagner <sebastian.wagner@suse.com>
Tue, 18 Feb 2020 14:30:25 +0000 (15:30 +0100)
committerSage Weil <sage@redhat.com>
Wed, 19 Feb 2020 02:03:57 +0000 (20:03 -0600)
Remove stray req from the -k8events package, since the base ceph-mgr now
requires it.

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

index 60befaee5a6f5b9044cc210934bb50e5f717c638..99fd431d5525b21888dd357e0953ab96e6f6b572 100644 (file)
@@ -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