From: Ken Dreyer <kdreyer@redhat.com>
Date: Thu, 9 Apr 2015 17:10:52 +0000 (-0600)
Subject: ceph.spec.in: set _with_systemd on RHEL 7 and Fedora
X-Git-Tag: v9.0.1~143^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aa88364f30e2d2f254ade185a83ba263b48e2a73;p=ceph.git

ceph.spec.in: set _with_systemd on RHEL 7 and Fedora

Commit 71a5090bca049a43e30a7f0cf99141950ef9c5dd added a "_with_systemd"
conditional to the RPMs, but I erred with the version comparison
operator, so this only applied to RHEL 8+, not RHEL 7+.

Adjust the conditional so that it will really apply to RHEL 7+. While
we're here, add Fedora as well.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Reported-by: Boris Ranto <branto@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 947bd14ee8aa..730a7e087c65 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -10,7 +10,7 @@
 # the _with_systemd variable only implies that we'll install
 # /etc/tmpfiles.d/ceph.conf in order to set up the socket directory in
 # /var/run/ceph.
-%if 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} >= 7
   %global _with_systemd 1
 %endif