From: Nathan Cutler <ncutler@suse.com>
Date: Mon, 20 Aug 2018 18:20:07 +0000 (+0200)
Subject: build/ops: rpm: package cephfs-shell for SUSE as well as Fedora
X-Git-Tag: v14.0.1~489^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e0f79368a4af5f10bb2287b0221b86ddfbc3e38a;p=ceph.git

build/ops: rpm: package cephfs-shell for SUSE as well as Fedora

6dd06b0c3468230212f6e4b567cd816554b88f83 introduced RPM packaging of cephfs-shell

This initial packaging was Fedora-only, but colorama and cmd2 *are* packaged
for both openSUSE and SLE.

Note: there is no py2-compatible version of cephfs-shell.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 787ec7ade66d..57cc61056381 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -47,14 +47,18 @@
 %endif
 %endif
 %bcond_with seastar
-%if 0%{?suse_version} >= 1500
+%if 0%{?fedora} || 0%{?suse_version} >= 1500
+# distros where py2 is _optional_
 %bcond_with python2
 %else
+# distros where py2 is _mandatory_
 %bcond_without python2
 %endif
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?suse_version} >= 1500
+# distros that ship cmd2 and/or colorama
 %bcond_without cephfs_shell
 %else
+# distros that do _not_ ship cmd2/colorama
 %bcond_with cephfs_shell
 %endif
 %if 0%{without python2}
@@ -781,9 +785,7 @@ well as the RESTful interface. These have to do with querying the daemons for
 command-description information, validating user command input against those
 descriptions, and submitting the command to the appropriate daemon.
 
-# python3-cmd2 and python3-colorama are not available in RHEL/CentOS, openSUSE
-# or SLES
-%if 0%{?fedora}
+%if 0%{with cephfs_shell}
 %package -n cephfs-shell
 Summary:    Interactive shell for Ceph file system
 Requires:   python%{python3_pkgversion}-cmd2
@@ -1780,7 +1782,7 @@ fi
 %{python3_sitelib}/ceph_daemon.py
 %{python3_sitelib}/__pycache__/ceph_daemon.cpython*.py*
 
-%if 0%{?fedora}
+%if 0%{with cephfs_shell}
 %files -n cephfs-shell
 %{python3_sitelib}/cephfs_shell-*.egg-info
 %{_bindir}/cephfs-shell