From a537f1e3f15988c59b8c08b679017bd82545e6bc Mon Sep 17 00:00:00 2001 From: Kaleb KEITHLEY Date: Tue, 8 Nov 2016 15:08:37 +0530 Subject: [PATCH 162/162] 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 the below mainline patch - http://review.gluster.org/15803 > Change-Id: I5917e5f22f07b4121d636b099dd8815847e1338f > BUG: 1389293 > 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 BUG: 1278336 Change-Id: I857c2ed97f3f09332ca9ca9fbe752d54b5fc252a Signed-off-by: Soumya Koduri Reviewed-on: https://code.engineering.redhat.com/gerrit/89514 Reviewed-by: Milind Changire Reviewed-by: Atin Mukherjee --- glusterfs.spec.in | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 5315eb8..91ed50e 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -397,9 +397,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 @@ -2048,6 +2048,7 @@ end * Fri Nov 11 2016 Soumya Koduri - Add dependency on portblock resource agent for ganesha package (#1278336) - Fix incorrect Requires for portblock resource agent (#1278336) +- Update version checks for portblock resource agent on RHEL (#1278336) * Fri Oct 14 2016 Milind Changire - Changed pretrans scripts to use os.tmpname() for enhanced security -- 1.7.1