Skip to content

Commit

Permalink
ceph.spec.in: consolidate centos/rhel macros
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
smithfarm committed May 15, 2015
1 parent 22984ee commit 46404dd
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions ceph.spec.in
Expand Up @@ -26,7 +26,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
Requires: librbd1 = %{epoch}:%{version}-%{release}
Expand Down Expand Up @@ -86,7 +86,7 @@ BuildRequires: xfsprogs
BuildRequires: xfsprogs-devel
BuildRequires: xmlstarlet
BuildRequires: yasm
%if 0%{?rhel} || 0%{?centos} || 0%{?fedora} || 0%{?suse_version}
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: snappy-devel
%endif
%if 0%{?suse_version}
Expand Down Expand Up @@ -201,7 +201,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
Expand Down Expand Up @@ -259,7 +259,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
Expand Down Expand Up @@ -294,7 +294,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
Expand Down Expand Up @@ -444,7 +444,7 @@ python-cephfs instead.
#################################################################################
%prep
%setup -q
%if 0%{?fedora} || 0%{?rhel} || 0%{?centos}
%if 0%{?fedora} || 0%{?rhel}
%patch0 -p1 -b .init
%endif

Expand Down

0 comments on commit 46404dd

Please sign in to comment.