]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: fix python-flask dependency for SUSE
authorNathan Cutler <ncutler@suse.com>
Mon, 15 Jun 2015 10:58:00 +0000 (12:58 +0200)
committerNathan Cutler <ncutler@suse.com>
Tue, 27 Oct 2015 10:24:17 +0000 (11:24 +0100)
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

ceph.spec.in

index 0361d160edc5b12512f85739bd50bc9625e28cb2..8b67afa6ba47ee7f908d46595afcda02bfdb0d64 100644 (file)
@@ -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