From 2c120529ec712da785e19397094153a02fcd2d89 Mon Sep 17 00:00:00 2001 From: Kaleb KEITHLEY Date: Tue, 8 Nov 2016 15:08:37 +0530 Subject: build: Update version check for resource-agents on RHEL With bug1302545[1] and bug1303037[2], portblock resource agent is made available as part of resource-agents-3.9.5* package on RHEL 6.8 and RHEL 7.3 respectively. This change is to update the same in the glusterfs spec. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1302545 [2] https://bugzilla.redhat.com/show_bug.cgi?id=1303037 This is backport of below mainline patch - http://review.gluster.org/15803 > Change-Id: I5917e5f22f07b4121d636b099dd8815847e1338f > BUG: 1389742 > Author: Kaleb KEITHLEY > Signed-off-by: Soumya Koduri > Reviewed-on: http://review.gluster.org/15803 > Reviewed-by: Kaleb KEITHLEY > Reviewed-by: jiffin tony Thottan > NetBSD-regression: NetBSD Build System > Smoke: Gluster Build System > CentOS-regression: Gluster Build System > (cherry picked from commit 3e980c5eff495725e7c01793451bc81fd6f94ad5) Change-Id: Ib7a3194f0581f131a537a7b543f396b4837bffbf BUG: 1389742 Signed-off-by: Soumya Koduri Reviewed-on: http://review.gluster.org/15807 NetBSD-regression: NetBSD Build System Reviewed-by: Kaleb KEITHLEY CentOS-regression: Gluster Build System Smoke: Gluster Build System --- glusterfs.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index dab1b1a11c8..a016dce23a8 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -372,9 +372,9 @@ Requires: nfs-ganesha-gluster, pcs, dbus %if ( 0%{?rhel} && 0%{?rhel} == 6 ) Requires: cman, pacemaker, corosync %endif -%if ( 0%{?fedora} ) -# we need portblock resource-agent in 3.9.6 and later. -Requires: resource-agents >= 3.9.6 +%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 5 ) +# we need portblock resource-agent in 3.9.5 and later. +Requires: resource-agents >= 3.9.5 %endif %description ganesha -- cgit