From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 3 Sep 2015 14:28:19 +0000 (+0200)
Subject: ceph.spec.in: drop redundant centos from conditionals
X-Git-Tag: v9.1.0~219^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e54f89677dd509ed2f79bb45be0260325055d97b;p=ceph.git

ceph.spec.in: drop redundant centos from conditionals

Since the %{rhel} macro is guaranteed to be defined on all CentOS
installations, the %{centos} macro is superfluous.

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

diff --git a/ceph.spec.in b/ceph.spec.in
index 322e21bee01d..6f8565423f09 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -111,10 +111,10 @@ BuildRequires:	pkgconfig
 BuildRequires:	python
 BuildRequires:	python-nose
 BuildRequires:	python-requests
-%if ( 0%{?rhel} > 0 && 0%{?rhel} < 7 ) || ( 0%{?centos} > 0 && 0%{?centos} < 7 )
+%if 0%{?rhel} > 0 && 0%{?rhel} < 7
 BuildRequires:	python-sphinx10
 %endif
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 7 || 0%{?centos} >= 7
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 7
 BuildRequires:	python-sphinx
 %endif
 
@@ -853,7 +853,7 @@ mkdir -p %{_localstatedir}/run/ceph/
 CEPH_GROUP_ID=""
 CEPH_USER_ID=""
 # disabled for now until we have the numbers
-%if 0%{?rhel} || 0%{?centos} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora}
 CEPH_GROUP_ID="-g 167"
 CEPH_USER_ID="-u 167"
 %endif