From 2db9480fa2646de776f0076d82747e202e574ddd Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Wed, 24 Jun 2015 16:39:30 -0600 Subject: [PATCH 1/2] ceph.spec.in: package rbd-replay-prep on all Fedoras This reverts the change in commit 85517d611b7bf4cb6cbffcd2c65303be0d038264. Since we BuildRequire: libbabeltrace-devel, autoconf will see that babeltrace is available during the build, and make will build/install the rbd-replay-prep utility. This change also simplifies Fedora selection logic, because Fedora 19 is EOL, so "%{fedora}" implies "Fedora 20 and above". Reported-by: Ira Cooper Signed-off-by: Ken Dreyer --- ceph.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceph.spec.in b/ceph.spec.in index e94d930850f..d7cbaca15e8 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -974,7 +974,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %{_mandir}/man8/rbd-replay-prep.8* %{_bindir}/rbd-replay %{_bindir}/rbd-replay-many -%if (0%{?fedora} == 20 || 0%{?rhel} == 6) +%if (0%{?fedora} || 0%{?rhel} == 6) %{_bindir}/rbd-replay-prep %endif From f3e4a91c458ca7b11706fe4608cb739499f5d3cc Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Wed, 24 Jun 2015 16:37:58 -0600 Subject: [PATCH 2/2] ceph.spec.in: rm reference to EOL Fedoras (< 20) Fedora 19 is EOL, so there's no need to refer to Fedoras less than 20. "%{fedora}" effectively implies "Fedora 20 and above". Reported-by: Ira Cooper Signed-off-by: Ken Dreyer --- ceph.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceph.spec.in b/ceph.spec.in index d7cbaca15e8..be000b1c246 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -354,7 +354,7 @@ Group: System Environment/Libraries License: LGPL-2.0 Requires: ceph-common Requires: xmlstarlet -%if (0%{?fedora} >= 20 || 0%{?rhel} == 6) +%if (0%{?fedora} || 0%{?rhel} == 6) BuildRequires: lttng-ust-devel BuildRequires: libbabeltrace-devel %endif