From: Dan Mick <dan.mick@redhat.com>
Date: Thu, 18 May 2017 01:35:15 +0000 (-0700)
Subject: ceph.spec.in, debian/control: build/runtime dependency for cherrypy
X-Git-Tag: v12.1.0~10^2~38^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd6f2d9210d0220fa83f65421173a369e8403847;p=ceph.git

ceph.spec.in, debian/control: build/runtime dependency for cherrypy

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 0b02efabe357..30831c11c30f 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -152,6 +152,7 @@ BuildRequires:	keyutils-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  lsb-release
 BuildRequires:  openldap2-devel
+BuildRequires:	python-CherryPy
 BuildRequires:	python-Cython
 BuildRequires:	python-Sphinx
 %endif
@@ -165,6 +166,7 @@ BuildRequires:  openldap-devel
 BuildRequires:  openssl-devel
 BuildRequires:  redhat-lsb-core
 BuildRequires:	Cython
+BuildRequires:	python-cherrypy
 BuildRequires:	python-sphinx
 %endif
 # python34-... for RHEL, python3-... for all other supported distros
@@ -309,6 +311,12 @@ License:        LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-wi
 Group:          System/Filesystems
 %endif
 Requires:       ceph-base = %{epoch}:%{version}-%{release}
+%if 0%{?fedora} || 0%{?rhel}
+Requires:      python-cherrypy
+%endif
+%if 0%{?suse_version}
+Requires: 	python-CherryPy
+%endif
 
 %description mgr
 ceph-mgr enables python modules that provide services (such as the REST
diff --git a/debian/control b/debian/control
index 43b582b4e0dc..ae6c6a73501d 100644
--- a/debian/control
+++ b/debian/control
@@ -51,6 +51,7 @@ Build-Depends: bc,
                pkg-config,
                python (>= 2.7),
                python-all-dev,
+               python-cherrypy3,
                python-nose,
 	       python-prettytable,
 	       python-setuptools,
@@ -162,6 +163,7 @@ Architecture: linux-any
 Depends: ceph-base (= ${binary:Version}),
          ${misc:Depends},
          ${python:Depends},
+	 python-cherrypy3,
          ${shlibs:Depends}
 Replaces: ceph (<< 0.93-417)
 Breaks: ceph (<< 0.93-417)