From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Thu, 30 Jul 2020 07:55:08 +0000 (+0200)
Subject: python-common, spec.in: Add missing pyyaml dependency
X-Git-Tag: wip-pdonnell-testing-20200918.022351~507^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0ada965fafb36094194347deebd4778f47bbe407;p=ceph-ci.git

python-common, spec.in: Add missing pyyaml dependency

Fixes: cd6a488ab2ca036dd4fb36751b938f605e97e1c8
Fixes: https://tracker.ceph.com/issues/46759
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 4b20dc2fa19..498116212ec 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -934,6 +934,12 @@ descriptions, and submitting the command to the appropriate daemon.
 
 %package -n python%{python3_pkgversion}-ceph-common
 Summary:	Python 3 utility libraries for Ceph
+%if 0%{?fedora} || 0%{?rhel} >= 8
+Requires:       python%{python3_pkgversion}-pyyaml
+%endif
+%if 0%{?suse_version}
+Requires:       python%{python3_pkgversion}-PyYAML
+%endif
 %if 0%{?suse_version}
 Group:		Development/Libraries/Python
 %endif
diff --git a/src/python-common/setup.py b/src/python-common/setup.py
index 369c928f928..43a46eb1019 100644
--- a/src/python-common/setup.py
+++ b/src/python-common/setup.py
@@ -17,6 +17,9 @@ setup(
     keywords='ceph',
     url="https://github.com/ceph/ceph",
     zip_safe = False,
+    install_requires=(	
+        'pyyaml',	
+    ),
     classifiers = [
         'Intended Audience :: Developer',
         'Operating System :: POSIX :: Linux',