From 3c2b5c440863df548afc2bd8aa5440f15a44ac02 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Tue, 12 Aug 2014 16:31:22 -0700 Subject: [PATCH] ceph.spec.in: tests for rhel or centos need to not include _version rhel_version and centos_version are apparently the OpenSUSE Build names; the native macros are just "rhel" and "centos" (and contain a version number, should it be necessary). Signed-off-by: Dan Mick (cherry picked from commit 7474f720c2418cf3d52b755f2b60c524e413570a) --- ceph.spec.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 978e1599ef414..38160c25bd838 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -16,7 +16,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_version} || 0%{?rhel_version} +%if 0%{?fedora} || 0%{?centos} || 0%{?rhel} Patch0: init-ceph.in-fedora.patch %endif Requires: librbd1 = %{version}-%{release} @@ -54,7 +54,7 @@ BuildRequires: libblkid-devel >= 2.17 BuildRequires: leveldb-devel > 1.2 BuildRequires: xfsprogs-devel BuildRequires: yasm -%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora} +%if 0%{?rhel} || 0%{?centos} || 0%{?fedora} BuildRequires: snappy-devel %endif @@ -177,7 +177,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_version} || 0%{?fedora} +%if 0%{?rhel} || 0%{?centos} || 0%{?fedora} Obsoletes: ceph-libs < %{version}-%{release} %endif %description -n librados2 @@ -191,7 +191,7 @@ Summary: RADOS block device client library Group: System Environment/Libraries License: LGPL-2.0 Requires: librados2 = %{version}-%{release} -%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora} +%if 0%{?rhel} || 0%{?centos} || 0%{?fedora} Obsoletes: ceph-libs < %{version}-%{release} %endif %description -n librbd1 @@ -204,7 +204,7 @@ shared library allowing applications to manage these block devices. Summary: Ceph distributed file system client library Group: System Environment/Libraries License: LGPL-2.0 -%if 0%{?rhel} || 0%{?centos_version} || 0%{?fedora} +%if 0%{?rhel} || 0%{?centos} || 0%{?fedora} Obsoletes: ceph-libs < %{version}-%{release} Obsoletes: ceph-libcephfs %endif @@ -294,7 +294,7 @@ librbd1 or libcephfs1 instead. ################################################################################# %prep %setup -q -%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} +%if 0%{?fedora} || 0%{?rhel} || 0%{?centos} %patch0 -p1 -b .init %endif -- 2.39.5