From: Loic Dachary <loic-201408@dachary.org>
Date: Sat, 11 Oct 2014 16:20:36 +0000 (+0200)
Subject: rpm: 95-ceph-osd-alt.rules is not needed for centos7 / rhel7
X-Git-Tag: v0.87~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f1fccb1d19efee3f78f2aa01043c3aeb32f67181;p=ceph.git

rpm: 95-ceph-osd-alt.rules is not needed for centos7 / rhel7

The || instead of && had it always installed. That was fixed in EPEL
already.

http://tracker.ceph.com/issues/9747 Fixes: #9747

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
(cherry picked from commit 5ff4a850a0d809b3f25988c6cceb82c35095ef84)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 293112064745..8a37b03310cd 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -379,7 +379,7 @@ install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/50-rbd.rul
 install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT/lib/udev/rules.d/60-ceph-partuuid-workaround.rules
 %endif
 
-%if (0%{?rhel} || 0%{?rhel} < 7)
+%if (0%{?rhel} && 0%{?rhel} < 7)
 install -m 0644 -D udev/95-ceph-osd-alt.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules
 %else
 install -m 0644 -D udev/95-ceph-osd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules