12a457
From e1e2c31bca42d78f2e83a910241ef126c44c437a Mon Sep 17 00:00:00 2001
12a457
From: Jiffin Tony Thottan <jthottan@gmail.com>
12a457
Date: Mon, 28 Mar 2016 16:39:24 +0530
12a457
Subject: [PATCH 35/80] build : fixing dependency issue for glusterfs-ganesha in RHEL6
12a457
12a457
glusterfs-ganesha requires "dbus-send" binary, but location of this
12a457
binary is different in RHEL6 and RHEL7. For RHEL6 it is /bin/ and
12a457
RHEL7 it is /usr/bin/. So the patch will add dependency based on
12a457
package dbus-1 not on the binary dbus-send
12a457
12a457
Upstream reference
12a457
>Change-Id: I266af7b983791be648749f01a04b38479d6f7c03
12a457
>BUG: 1322242
12a457
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
12a457
>Reviewed-on: http://review.gluster.org/13848
12a457
>Smoke: Gluster Build System <jenkins@build.gluster.com>
12a457
>Reviewed-by: Niels de Vos <ndevos@redhat.com>
12a457
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
12a457
>CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
12a457
>cherry-picked as 71d988919c75e1294eb417a92f0a495cf388002e
12a457
12a457
Change-Id: I266af7b983791be648749f01a04b38479d6f7c03
12a457
BUG: 1321544
12a457
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
12a457
Reviewed-on: https://code.engineering.redhat.com/gerrit/70854
12a457
Reviewed-by: Niels de Vos <ndevos@redhat.com>
12a457
Tested-by: Niels de Vos <ndevos@redhat.com>
12a457
---
12a457
 glusterfs.spec.in |    3 +--
12a457
 1 files changed, 1 insertions(+), 2 deletions(-)
12a457
12a457
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
12a457
index 7e9d7f3..7366bcd 100644
12a457
--- a/glusterfs.spec.in
12a457
+++ b/glusterfs.spec.in
12a457
@@ -394,8 +394,7 @@ Summary:          NFS-Ganesha configuration
12a457
 Group:            Applications/File
12a457
 
12a457
 Requires:         %{name}-server%{?_isa} = %{version}-%{release}
12a457
-Requires:         nfs-ganesha-gluster
12a457
-Requires:         pcs, /usr/bin/dbus-send
12a457
+Requires:         nfs-ganesha-gluster, pcs, dbus
12a457
 
12a457
 %description ganesha
12a457
 GlusterFS is a distributed file-system capable of scaling to several
12a457
-- 
12a457
1.7.1
12a457