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