From 8d4931bb369c31178c93a43f8325f599249168d4 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 15 Jun 2015 12:58:00 +0200 Subject: [PATCH] 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 (cherry picked from commit 39c28b9faf0fb069d91ac069a4d8df7bf03fb490) Conflicts: ceph.spec.in add missing SUSE-specific build deps --- ceph.spec.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ceph.spec.in b/ceph.spec.in index 0361d160edc5b..8b67afa6ba47e 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -41,7 +41,6 @@ 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: logrotate @@ -98,6 +97,8 @@ BuildRequires: net-tools # distro-conditional dependencies ################################################################################# %if 0%{defined suse_version} +Requires: python-Flask +BuildRequires: sharutils %if 0%{?suse_version} > 1210 Requires: gptfdisk BuildRequires: gperftools-devel @@ -119,6 +120,7 @@ Requires(post): chkconfig Requires(preun):chkconfig Requires(preun):initscripts BuildRequires: gperftools-devel +Requires: python-flask %endif %description -- 2.39.5