]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: drop redundant centos from conditionals 5791/head
authorNathan Cutler <ncutler@suse.com>
Thu, 3 Sep 2015 14:28:19 +0000 (16:28 +0200)
committerNathan Cutler <ncutler@suse.com>
Thu, 3 Sep 2015 14:32:08 +0000 (16:32 +0200)
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>
ceph.spec.in

index 322e21bee01db167323e0641f7e6b9c744dbe995..6f8565423f09f2d9429e880ec7445ec73f7c824f 100644 (file)
@@ -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