diff options
| author | Kaleb KEITHLEY <kkeithle@redhat.com> | 2016-11-08 15:08:37 +0530 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2016-11-09 10:19:11 -0800 |
| commit | 2c120529ec712da785e19397094153a02fcd2d89 (patch) | |
| tree | b59fb7afba5b047a1b2d8231ee166ee1b9d4ca3a /glusterfs.spec.in | |
| parent | 5f34de09997b653d05330477c7cb4e17508e3230 (diff) | |
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 <kkeithle@redhat.com>
> Signed-off-by: Soumya Koduri <skoduri@redhat.com>
> Reviewed-on: http://review.gluster.org/15803
> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
> Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> (cherry picked from commit 3e980c5eff495725e7c01793451bc81fd6f94ad5)
Change-Id: Ib7a3194f0581f131a537a7b543f396b4837bffbf
BUG: 1389742
Signed-off-by: Soumya Koduri <skoduri@redhat.com>
Reviewed-on: http://review.gluster.org/15807
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.org>
Diffstat (limited to 'glusterfs.spec.in')
| -rw-r--r-- | glusterfs.spec.in | 6 |
1 files 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 |