]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: consolidate centos/rhel macros
authorNathan Cutler <ncutler@suse.cz>
Fri, 15 May 2015 19:39:39 +0000 (21:39 +0200)
committerNathan Cutler <ncutler@suse.com>
Mon, 26 Oct 2015 11:40:54 +0000 (12:40 +0100)
0%{?rhel} || 0%{?centos} can be simplified to just 0%{?rhel}, since
CentOS defines that macro for compatibility with RHEL.

Signed-off-by: Nathan Cutler <ncutler@suse.cz>
(cherry picked from commit 46404dd381e240634d224e77adc69f0ba4807045)

Conflicts:
ceph.spec.in
            https://github.com/ceph/ceph/pull/4068 has not been backported

ceph.spec.in

index 6356410555d56ff4bae16d5545238a81ff93e780..fde8e6a8fd3c8dc54ef137410869ca1f08d74e00 100644 (file)
@@ -17,7 +17,7 @@ License:      GPL-2.0
 Group:         System Environment/Base
 URL:           http://ceph.com/
 Source0:       http://ceph.com/download/%{name}-%{version}.tar.bz2
-%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
+%if 0%{?fedora} || 0%{?rhel}
 Patch0:                init-ceph.in-fedora.patch
 %endif
 #################################################################################
@@ -193,7 +193,7 @@ managers such as Pacemaker.
 Summary:       RADOS distributed object store client library
 Group:         System Environment/Libraries
 License:       LGPL-2.0
-%if 0%{?rhel} || 0%{?centos} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora}
 Obsoletes:     ceph-libs < %{epoch}:%{version}-%{release}
 %endif
 %description -n librados2
@@ -248,7 +248,7 @@ Summary:    RADOS block device client library
 Group:         System Environment/Libraries
 License:       LGPL-2.0
 Requires:      librados2 = %{epoch}:%{version}-%{release}
-%if 0%{?rhel} || 0%{?centos} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora}
 Obsoletes:     ceph-libs < %{epoch}:%{version}-%{release}
 %endif
 %description -n librbd1
@@ -283,7 +283,7 @@ block device.
 Summary:       Ceph distributed file system client library
 Group:         System Environment/Libraries
 License:       LGPL-2.0
-%if 0%{?rhel} || 0%{?centos} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora}
 Obsoletes:     ceph-libs < %{epoch}:%{version}-%{release}
 Obsoletes:     ceph-libcephfs
 %endif
@@ -440,7 +440,7 @@ python-cephfs instead.
 #################################################################################
 %prep
 %setup -q
-%if 0%{?fedora} || 0%{?rhel} || 0%{?centos}
+%if 0%{?fedora} || 0%{?rhel}
 %patch0 -p1 -b .init
 %endif