From: Kefu Chai <kchai@redhat.com>
Date: Thu, 5 Jul 2018 10:36:10 +0000 (+0800)
Subject: deb/rpm: add python-six as build-time and run-time dependency
X-Git-Tag: v12.2.8~35^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a4149b32344aebd72f22709cebab4749da27ae8;p=ceph.git

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 <kchai@redhat.com>
(cherry picked from commit e53bb2c5a32e9b458a55fe01b28f23bdf952b6f7)

Conflicts:
	ceph.spec.in
	debian/control

- adapted for luminous
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 2f89a9bc1a13..6970a86fe0ee 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -142,6 +142,7 @@ BuildRequires:	python
 BuildRequires:	python-devel
 BuildRequires:	python-nose
 BuildRequires:	python-requests
+BuildRequires:	python-six
 BuildRequires:	python-virtualenv
 BuildRequires:	snappy-devel
 BuildRequires:	udev
@@ -322,6 +323,7 @@ Summary:        Ceph Manager Daemon
 Group:          System/Filesystems
 %endif
 Requires:       ceph-base = %{_epoch_prefix}%{version}-%{release}
+Requires:       python-six
 %if 0%{?fedora} || 0%{?rhel}
 Requires:       python-cherrypy
 Requires:       python-jinja2
diff --git a/debian/control b/debian/control
index bdc74471da30..d5bc16e9eea8 100644
--- a/debian/control
+++ b/debian/control
@@ -55,6 +55,7 @@ Build-Depends: bc,
                python-pecan,
                python-prettytable,
                python-setuptools,
+               python-six,
                python-sphinx,
                python-werkzeug,
                python3-all-dev,