From 052acf7e3e962e344a5b8a44c2da704427fa5606 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 5 Jul 2018 18:36:10 +0800 Subject: [PATCH] deb/rpm: add python-six as build-time and run-time dependency python-six is used by dashboard's controllers. please note, ${python:Depends} is able to fill the installation dependencies for debian package. so python-six is not added to Requires of ceph-mgr. Signed-off-by: Kefu Chai (cherry picked from commit e53bb2c5a32e9b458a55fe01b28f23bdf952b6f7) --- ceph.spec.in | 6 +++++- debian/control | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ceph.spec.in b/ceph.spec.in index a3dc0963487c3..99e8589226951 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -227,6 +227,7 @@ BuildRequires: python%{_python_buildid}-pecan BuildRequires: python%{_python_buildid}-werkzeug BuildRequires: python%{_python_buildid}-tox BuildRequires: python%{_python_buildid}-coverage +BuildRequires: python%{_python_buildid}-six %if 0%{?fedora} BuildRequires: python%{_python_buildid}-bcrypt %endif @@ -243,6 +244,7 @@ BuildRequires: python%{_python_buildid}-numpy-devel BuildRequires: python%{_python_buildid}-bcrypt BuildRequires: python%{_python_buildid}-tox BuildRequires: python%{_python_buildid}-coverage +BuildRequires: python%{_python_buildid}-six %endif %endif # lttng and babeltrace for rbd-replay-prep @@ -369,9 +371,10 @@ Group: System/Filesystems Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} Requires: python%{_python_buildid}-cherrypy -Requires: python%{_python_buildid}-routes Requires: python%{_python_buildid}-jinja2 Requires: python%{_python_buildid}-pecan +Requires: python%{_python_buildid}-routes +Requires: python%{_python_buildid}-six Requires: python%{_python_buildid}-werkzeug Requires: pyOpenSSL%{_python_buildid} %if 0%{?fedora} @@ -388,6 +391,7 @@ Requires: python%{_python_buildid}-Jinja2 Requires: python%{_python_buildid}-Werkzeug Requires: python%{_python_buildid}-pecan Requires: python%{_python_buildid}-pyOpenSSL +Requires: python%{_python_buildid}-six Requires: python%{_python_buildid}-bcrypt Recommends: python%{_python_buildid}-influxdb %endif diff --git a/debian/control b/debian/control index d9906ef10fc2c..0092c81d275cc 100644 --- a/debian/control +++ b/debian/control @@ -56,6 +56,7 @@ Build-Depends: bc, python-nose, python-pecan, python-bcrypt, + python-six, python-tox, python-coverage, python-prettytable, -- 2.39.5