From 1a0bb0f6876c653fdd55d6f7b66085c741408b31 Mon Sep 17 00:00:00 2001
From: Nathan Cutler <ncutler@suse.com>
Date: Fri, 26 Feb 2016 22:23:01 +0100
Subject: [PATCH] packaging: move python-flask runtime dependency to ceph-mon,
 radosgw

Flask is used by MON (in the Ceph REST API) and by RGW (powerdns).
Therefore, it only needs to be in the ceph-mon and ceph-radosgw packages.

Also, this commit encloses the specification of the python-flask runtime
dependency in distro-conditional blocks to account for a minor difference
in the package name between RHEL and SUSE.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---
 ceph.spec.in   | 15 ++++++++++++---
 debian/control | 13 +++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ceph.spec.in b/ceph.spec.in
index 9b11482f754c2..84f69288e5ed5 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -150,7 +150,6 @@ BuildRequires:	systemd
 %{?systemd_requires}
 %endif
 PreReq:		%fillup_prereq
-Requires:	python-Flask
 BuildRequires:	net-tools
 BuildRequires:	libbz2-devel
 %if 0%{?suse_version} > 1210
@@ -177,7 +176,6 @@ Requires(post):	chkconfig
 Requires(preun):	chkconfig
 Requires(preun):	initscripts
 BuildRequires:	gperftools-devel
-Requires:	python-flask
 %endif
 # boost
 %if 0%{?fedora} || 0%{?rhel} 
@@ -284,7 +282,12 @@ Summary:	Ceph Monitor Daemon
 Group:		System Environment/Base
 Requires:	ceph-base = %{epoch}:%{version}-%{release}
 # For ceph-rest-api
-Requires:	python-flask
+%if 0%{?fedora} || 0%{?rhel}
+Requires:      python-flask
+%endif
+%if 0%{?suse_version}
+Requires:      python-Flask
+%endif
 %description mon
 ceph-mon is the cluster monitor daemon for the Ceph distributed file
 system. One or more instances of ceph-mon form a Paxos part-time
@@ -336,6 +339,12 @@ Requires:	ceph-selinux = %{epoch}:%{version}-%{release}
 Requires:	librados2 = %{epoch}:%{version}-%{release}
 %if 0%{?rhel} || 0%{?fedora}
 Requires:	mailcap
+# python-flask for powerdns
+Requires:	python-flask
+%endif
+%if 0%{?suse_version}
+# python-Flask for powerdns
+Requires:      python-Flask
 %endif
 %description radosgw
 This package is an S3 HTTP REST gateway for the RADOS object store. It
diff --git a/debian/control b/debian/control
index 4f5878c9b74ef..117cd39bdd9fa 100644
--- a/debian/control
+++ b/debian/control
@@ -89,7 +89,6 @@ Depends: binutils,
          python-argparse,
          sdparm | hdparm,
          xfsprogs,
-	 python-flask,
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: btrfs-tools, ceph-mds, librados2, libradosstriper1, librbd1
@@ -134,7 +133,10 @@ Description: debugging symbols for ceph-mds
 
 Package: ceph-mon
 Architecture: linux-any
-Depends: ceph-base (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: ceph-base (= ${binary:Version}),
+         python-flask,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: ceph-common
 Replaces: ceph (<< 9.0.1-1294)
 Breaks: ceph (<< 9.0.1-1294)
@@ -539,8 +541,11 @@ Description: Ceph distributed file system client library (development files)
 
 Package: radosgw
 Architecture: linux-any
-Depends: ceph-common (= ${binary:Version}), mime-support,
-         ${misc:Depends}, ${shlibs:Depends}
+Depends: ceph-common (= ${binary:Version}),
+         mime-support,
+         python-flask,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: REST gateway for RADOS distributed object store
  RADOS is a distributed object store used by the Ceph distributed
  storage system.  This package provides a REST gateway to the
-- 
2.39.5