From: Kefu Chai <kchai@redhat.com>
Date: Fri, 8 May 2020 17:53:46 +0000 (+0800)
Subject: rpm: BuildRequires fmt-devel on el8
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1310^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d5932cb8de9dac6c4a2779bea3521a98b7d1d6e2;p=ceph-ci.git

rpm: BuildRequires fmt-devel on el8

it's included in EPEL8 now.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 8024b99749a..1d6f96d7158 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -238,7 +238,7 @@ BuildRequires:  protobuf-devel
 BuildRequires:  ragel
 BuildRequires:  systemtap-sdt-devel
 BuildRequires:  yaml-cpp-devel
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
 BuildRequires:  fmt-devel
 BuildRequires:  libubsan
 BuildRequires:  libasan
@@ -249,11 +249,6 @@ BuildRequires:  devtoolset-8-libubsan
 BuildRequires:  devtoolset-8-libasan
 BuildRequires:  devtoolset-8-libatomic
 %endif
-%if 0%{?rhel} >= 8
-BuildRequires:  libubsan
-BuildRequires:  libasan
-BuildRequires:  libatomic
-%endif
 %endif
 #################################################################################
 # distro-conditional dependencies