|
 |
3604df |
From a537f1e3f15988c59b8c08b679017bd82545e6bc Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Kaleb KEITHLEY <kkeithle@redhat.com>
|
|
|
3604df |
Date: Tue, 8 Nov 2016 15:08:37 +0530
|
|
|
3604df |
Subject: [PATCH 162/162] build: Update version check for resource-agents on RHEL
|
|
|
3604df |
|
|
|
3604df |
With bug1302545[1] and bug1303037[2], portblock resource agent
|
|
|
3604df |
is made available as part of resource-agents-3.9.5* package
|
|
|
3604df |
on RHEL 6.8 and RHEL 7.3 respectively. This change is to
|
|
|
3604df |
update the same in the glusterfs spec.
|
|
|
3604df |
|
|
|
3604df |
[1] https://bugzilla.redhat.com/show_bug.cgi?id=1302545
|
|
|
3604df |
[2] https://bugzilla.redhat.com/show_bug.cgi?id=1303037
|
|
|
3604df |
|
|
|
3604df |
This is backport of the below mainline patch -
|
|
|
3604df |
http://review.gluster.org/15803
|
|
|
3604df |
|
|
|
3604df |
> Change-Id: I5917e5f22f07b4121d636b099dd8815847e1338f
|
|
|
3604df |
> BUG: 1389293
|
|
|
3604df |
> Author: Kaleb KEITHLEY <kkeithle@redhat.com>
|
|
|
3604df |
> Signed-off-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
3604df |
> Reviewed-on: http://review.gluster.org/15803
|
|
|
3604df |
> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
|
|
|
3604df |
> Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
|
|
|
3604df |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
|
|
|
3604df |
BUG: 1278336
|
|
|
3604df |
Change-Id: I857c2ed97f3f09332ca9ca9fbe752d54b5fc252a
|
|
|
3604df |
Signed-off-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/89514
|
|
|
3604df |
Reviewed-by: Milind Changire <mchangir@redhat.com>
|
|
|
3604df |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
glusterfs.spec.in | 7 ++++---
|
|
|
3604df |
1 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
3604df |
index 5315eb8..91ed50e 100644
|
|
|
3604df |
--- a/glusterfs.spec.in
|
|
|
3604df |
+++ b/glusterfs.spec.in
|
|
|
3604df |
@@ -397,9 +397,9 @@ Requires: nfs-ganesha-gluster, pcs, dbus
|
|
|
3604df |
%if ( 0%{?rhel} && 0%{?rhel} == 6 )
|
|
|
3604df |
Requires: cman, pacemaker, corosync
|
|
|
3604df |
%endif
|
|
|
3604df |
-%if ( 0%{?fedora} )
|
|
|
3604df |
-# we need portblock resource-agent in 3.9.6 and later.
|
|
|
3604df |
-Requires: resource-agents >= 3.9.6
|
|
|
3604df |
+%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 5 )
|
|
|
3604df |
+# we need portblock resource-agent in 3.9.5 and later.
|
|
|
3604df |
+Requires: resource-agents >= 3.9.5
|
|
|
3604df |
%endif
|
|
|
3604df |
|
|
|
3604df |
%description ganesha
|
|
|
3604df |
@@ -2048,6 +2048,7 @@ end
|
|
|
3604df |
* Fri Nov 11 2016 Soumya Koduri <skoduri@redhat.com>
|
|
|
3604df |
- Add dependency on portblock resource agent for ganesha package (#1278336)
|
|
|
3604df |
- Fix incorrect Requires for portblock resource agent (#1278336)
|
|
|
3604df |
+- Update version checks for portblock resource agent on RHEL (#1278336)
|
|
|
3604df |
|
|
|
3604df |
* Fri Oct 14 2016 Milind Changire <mchangir@redhat.com>
|
|
|
3604df |
- Changed pretrans scripts to use os.tmpname() for enhanced security
|
|
|
3604df |
--
|
|
|
3604df |
1.7.1
|
|
|
3604df |
|