From: Nathan Cutler <ncutler@suse.com>
Date: Mon, 15 Jun 2015 10:58:00 +0000 (+0200)
Subject: ceph.spec.in: fix python-flask dependency for SUSE
X-Git-Tag: v0.94.6~70^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6b306eba829b1ec9822b24243ee7c021aab3d738;p=ceph.git

ceph.spec.in: fix python-flask dependency for SUSE

In SLE and openSUSE, the package is called python-Flask with an upper-case F.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 39c28b9faf0fb069d91ac069a4d8df7bf03fb490)

Conflicts:
	ceph.spec.in
            add missing SUSE-specific build deps
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 6497e9893b30..092db495ebe4 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -32,7 +32,7 @@ Requires:	python-rbd = %{epoch}:%{version}-%{release}
 Requires:	python-cephfs = %{epoch}:%{version}-%{release}
 Requires:	python
 Requires:	python-requests
-Requires:	python-flask
+Requires:	grep
 Requires:	xfsprogs
 Requires:	parted
 Requires:	util-linux
@@ -83,6 +83,10 @@ BuildRequires:	net-tools
 # distro-conditional dependencies
 #################################################################################
 %if 0%{defined suse_version}
+Requires:	python-Flask
+BuildRequires:	net-tools
+BuildRequires:	libbz2-devel
+BuildRequires:	sharutils
 %if 0%{?suse_version} > 1210
 Requires:	gptfdisk
 BuildRequires:	gperftools-devel
@@ -105,6 +109,7 @@ Requires(post):	chkconfig
 Requires(preun):chkconfig
 Requires(preun):initscripts
 BuildRequires:	gperftools-devel
+Requires:	python-flask
 %endif
 
 %description