diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2016-10-28 08:59:04 -0400 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2016-11-04 03:10:08 -0700 |
| commit | bbeb83f5c431151d095336d49908aeb3b11d28d2 (patch) | |
| tree | c0ed8c96960b8e85f91661b3644ac5c879ffb116 | |
| parent | 0c908b6c03f6e5e050a49d2c49505dc7cd8efbbc (diff) | |
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: 1389742
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/15754
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
| -rw-r--r-- | glusterfs.spec.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index e42dfb97d0f..dab1b1a11c8 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -372,8 +372,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 |