From: Nathan Cutler <ncutler@suse.com>
Date: Tue, 19 Mar 2019 10:48:31 +0000 (+0100)
Subject: rpm: fix "rhel <= 7" conditional
X-Git-Tag: v15.0.0~185^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F27045%2Fhead;p=ceph.git

rpm: fix "rhel <= 7" conditional

We do not build for RHEL 6 and below, so "rhel == 7" is just as good, while
also avoiding the bug.

In addition, "rhel == 7" is the conditional we are using everywhere else in the
spec file for this purpose.

Fixes: https://tracker.ceph.com/issues/38810
Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 5844a5af3c5d..07a1fcb8dc84 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -503,7 +503,7 @@ Requires:       python3-scipy
 Requires:       python2-scipy
 %endif
 %endif
-%if 0%{?rhel} <= 7
+%if 0%{?rhel} == 7
 Requires:       numpy
 Requires:       scipy
 %endif