|
 |
12a457 |
From 2d30977c75ae518a5f333508af7f79bbd5137081 Mon Sep 17 00:00:00 2001
|
|
|
12a457 |
From: Kaleb S KEITHLEY <kkeithle@redhat.com>
|
|
|
12a457 |
Date: Tue, 12 Apr 2016 07:11:07 -0400
|
|
|
12a457 |
Subject: [PATCH 67/80] packaging: gluster-ganesha requires pacemaker, etc., on RHEL6
|
|
|
12a457 |
|
|
|
12a457 |
HA packages in RHEL6 are missing dependencies. (Fedora and RHEL7
|
|
|
12a457 |
have good dependencies.)
|
|
|
12a457 |
|
|
|
12a457 |
Backport of
|
|
|
12a457 |
> master
|
|
|
12a457 |
> Change-Id: I4e80b569ea89f97e8a110aee2f4554175aa0ec8b
|
|
|
12a457 |
> BUG: 1322801
|
|
|
12a457 |
> http://review.gluster.org/13870
|
|
|
12a457 |
> release-3.7
|
|
|
12a457 |
> Change-Id: I411eeb5c4ee1a2f1ec0869ca4a9bbacd8c4a5fcb
|
|
|
12a457 |
> BUG: 1322808
|
|
|
12a457 |
> http://review.gluster.org/13871
|
|
|
12a457 |
|
|
|
12a457 |
Change-Id: Iee4b6716f9781c1886a4012136b141514f68fe97
|
|
|
12a457 |
BUG: 1292034
|
|
|
12a457 |
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
|
|
|
12a457 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/71967
|
|
|
12a457 |
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
12a457 |
Reviewed-by: Jiffin Thottan <jthottan@redhat.com>
|
|
|
12a457 |
---
|
|
|
12a457 |
glusterfs.spec.in | 6 ++++++
|
|
|
12a457 |
1 files changed, 6 insertions(+), 0 deletions(-)
|
|
|
12a457 |
|
|
|
12a457 |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
12a457 |
index 7366bcd..89037aa 100644
|
|
|
12a457 |
--- a/glusterfs.spec.in
|
|
|
12a457 |
+++ b/glusterfs.spec.in
|
|
|
12a457 |
@@ -395,6 +395,9 @@ Group: Applications/File
|
|
|
12a457 |
|
|
|
12a457 |
Requires: %{name}-server%{?_isa} = %{version}-%{release}
|
|
|
12a457 |
Requires: nfs-ganesha-gluster, pcs, dbus
|
|
|
12a457 |
+%if ( 0%{?rhel} && 0%{?rhel} == 6 )
|
|
|
12a457 |
+Requires: cman, pacemaker, corosync
|
|
|
12a457 |
+%endif
|
|
|
12a457 |
|
|
|
12a457 |
%description ganesha
|
|
|
12a457 |
GlusterFS is a distributed file-system capable of scaling to several
|
|
|
12a457 |
@@ -1934,6 +1937,9 @@ end
|
|
|
12a457 |
|
|
|
12a457 |
|
|
|
12a457 |
%changelog
|
|
|
12a457 |
+* Tue Apr 12 2016 Kaleb S. KEITHLEY <kkeithle@redhat.com>
|
|
|
12a457 |
+- pacemaker dependencies on RHEL6 (#1292034)
|
|
|
12a457 |
+
|
|
|
12a457 |
* Tue Mar 8 2016 Kaleb S. KEITHLEY <kkeithle@redhat.com>
|
|
|
12a457 |
- %%pre, %%post etc. scriptlet cleanup, ... -p /sbin/ldconfig (#1315935)
|
|
|
12a457 |
|
|
|
12a457 |
--
|
|
|
12a457 |
1.7.1
|
|
|
12a457 |
|