|
 |
3604df |
From 0283d39c3f6159a4b56caecea890305dc2d617cb Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
|
|
|
3604df |
Date: Thu, 27 Oct 2016 08:01:44 -0400
|
|
|
3604df |
Subject: [PATCH 161/162] build: incorrect Requires for portblock resource agent
|
|
|
3604df |
|
|
|
3604df |
was:
|
|
|
3604df |
Requires: /usr/lib/ocf/resource.d/portblock
|
|
|
3604df |
s/b:
|
|
|
3604df |
Requires: /usr/lib/ocf/resource.d/heartbeat/portblock
|
|
|
3604df |
or:
|
|
|
3604df |
Requires: resource-agents >= 3.9.6
|
|
|
3604df |
|
|
|
3604df |
Note: RHEL6.8 and RHEL7.2 have resource-agents-3.9.5 which does
|
|
|
3604df |
not contain the portblock resource agent.
|
|
|
3604df |
|
|
|
3604df |
I'm not sure what the point is actually of:
|
|
|
3604df |
|
|
|
3604df |
Requires: /usr/lib/ocf/resource.d/heartbeat/portblock
|
|
|
3604df |
|
|
|
3604df |
as it will fail to install on RHEL whether you have the
|
|
|
3604df |
resource-agents package installed or not. Hence wrapping it
|
|
|
3604df |
in %if ( fedora ).
|
|
|
3604df |
|
|
|
3604df |
This is backport of the below mainline patch -
|
|
|
3604df |
http://review.gluster.org/15743
|
|
|
3604df |
|
|
|
3604df |
> Change-Id: Ia7d6a475464c7469018678c98fc710a3b3bfc553
|
|
|
3604df |
> BUG: 1389293
|
|
|
3604df |
> Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
|
|
|
3604df |
> Reviewed-on: http://review.gluster.org/15743
|
|
|
3604df |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
|
|
|
3604df |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
|
|
|
3604df |
|
|
|
3604df |
BUG: 1278336
|
|
|
3604df |
Change-Id: Ie08830d2d4860dea735f90eee367dd758271a956
|
|
|
3604df |
Signed-off-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/89513
|
|
|
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, 5 insertions(+), 2 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
3604df |
index 29cc7ba..5315eb8 100644
|
|
|
3604df |
--- a/glusterfs.spec.in
|
|
|
3604df |
+++ b/glusterfs.spec.in
|
|
|
3604df |
@@ -397,8 +397,10 @@ Requires: nfs-ganesha-gluster, pcs, dbus
|
|
|
3604df |
%if ( 0%{?rhel} && 0%{?rhel} == 6 )
|
|
|
3604df |
Requires: cman, pacemaker, corosync
|
|
|
3604df |
%endif
|
|
|
3604df |
-# we need portblock resource-agent
|
|
|
3604df |
-Requires: %{_prefix}/lib/ocf/resource.d/portblock
|
|
|
3604df |
+%if ( 0%{?fedora} )
|
|
|
3604df |
+# we need portblock resource-agent in 3.9.6 and later.
|
|
|
3604df |
+Requires: resource-agents >= 3.9.6
|
|
|
3604df |
+%endif
|
|
|
3604df |
|
|
|
3604df |
%description ganesha
|
|
|
3604df |
GlusterFS is a distributed file-system capable of scaling to several
|
|
|
3604df |
@@ -2045,6 +2047,7 @@ end
|
|
|
3604df |
%changelog
|
|
|
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 |
|
|
|
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 |
|