summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2016-05-09 11:56:37 +0200
committerNiels de Vos <ndevos@redhat.com>2016-05-10 08:03:32 -0700
commit4733081a90b68787e2eeac6680051c28ee12566f (patch)
treeef229a0c18caf23e06f3e68f3c3e56eb31f4f9de
parent610a3f5bcc9f3443da55d857b162c83d50fa3a6b (diff)
packaging: resource-agents sub-package needs arch-less requires
The glusterfs-resource-agents package is marked as 'noarch'. It should therefor not have a dependency on a specific architecture (is done with the _isa macro). Backport from the master branch: > BUG: 1334269 > Change-Id: I3d24c0e4e60e368b22eef97bf3aabe6b020a23a9 > Reviewed-on: http://review.gluster.org/14269 > Signed-off-by: Niels de Vos <ndevos@redhat.com> Change-Id: I3d24c0e4e60e368b22eef97bf3aabe6b020a23a9 BUG: 1334268 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/14273 Smoke: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
-rw-r--r--glusterfs.spec.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 5b32b82a335..4135e123aea 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -483,7 +483,7 @@ Group: System Environment/Base
Group: Productivity/Clustering/HA
%endif
# for glusterd
-Requires: %{name}-server%{?_isa} = %{version}-%{release}
+Requires: %{name}-server = %{version}-%{release}
# depending on the distribution, we need pacemaker or resource-agents
Requires: %{_prefix}/lib/ocf/resource.d