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>
(cherry picked from commit 0ada965fafb36094194347deebd4778f47bbe407)

 Conflicts:
	src/python-common/setup.py
        picked both changes

diff --git a/ceph.spec.in b/ceph.spec.in
index 23274268df64811830b8adabd9dafebae426baaf..70f4009de8f1abb33335ce7af705e8fb86d0482b 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -991,6 +991,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 48daee6dee4d7945872c9da7973d1a248c9682c3..a5bdaf9a9254fd8b01d53224968cb70287820991 100644 (file)
--- a/src/python-common/setup.py
+++ b/src/python-common/setup.py
@@ -18,6 +18,7 @@ setup(
     url="https://github.com/ceph/ceph",
     zip_safe = False,
     install_requires=(
+        'pyyaml',
         'six',
     ),
     classifiers = [