From 1e421f75e040ebfce1bb6b36f9c213630807a45c Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 27 Oct 2016 08:01:44 -0400 Subject: 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 ). 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 --- glusterfs.spec.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'glusterfs.spec.in') diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 3753651df4a..bf294ee0ae2 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -378,8 +378,10 @@ Requires: 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 -- cgit