a3470f
From 867536a4ced38d72a7d980cd34bcbf0ce876206a Mon Sep 17 00:00:00 2001
a3470f
From: Soumya Koduri <skoduri@redhat.com>
a3470f
Date: Fri, 18 Nov 2016 12:47:06 +0530
a3470f
Subject: [PATCH 25/74] build: Add dependency on netstat for glusterfs-ganesha
a3470f
 pkg
a3470f
a3470f
portblock resource-agent needs netstat command but this dependency
a3470f
should have been ideally added to resource-agents package. But the
a3470f
fixes (bug1395594, bug1395596) are going to be available only
a3470f
in the future RHEL 6.9 and RHEL 7.4 releases. Hence as an interim
a3470f
workaround, we agreed to add this dependency for glusterfs-ganesha package.
a3470f
a3470f
label : DOWNSTREAM ONLY
a3470f
a3470f
Change-Id: I6ac1003103755d7534dd079c821bbaacd8dd94b8
a3470f
Signed-off-by: Soumya Koduri <skoduri@redhat.com>
a3470f
Reviewed-on: https://code.engineering.redhat.com/gerrit/90529
a3470f
Reviewed-by: Jiffin Thottan <jthottan@redhat.com>
a3470f
Reviewed-by: Milind Changire <mchangir@redhat.com>
a3470f
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
a3470f
---
a3470f
 glusterfs.spec.in | 13 +++++++++++++
a3470f
 1 file changed, 13 insertions(+)
a3470f
a3470f
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
a3470f
index ab61688..343e88f 100644
a3470f
--- a/glusterfs.spec.in
a3470f
+++ b/glusterfs.spec.in
a3470f
@@ -414,6 +414,11 @@ Requires:         nfs-ganesha-gluster, pcs, dbus
a3470f
 %if ( 0%{?rhel} && 0%{?rhel} == 6 )
a3470f
 Requires:         cman, pacemaker, corosync
a3470f
 %endif
a3470f
+%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 5 )
a3470f
+# we need portblock resource-agent in 3.9.5 and later.
a3470f
+Requires:         resource-agents >= 3.9.5
a3470f
+Requires:         net-tools
a3470f
+%endif
a3470f
 
a3470f
 %description ganesha
a3470f
 GlusterFS is a distributed file-system capable of scaling to several
a3470f
@@ -2225,6 +2230,14 @@ end
a3470f
 * Thu Nov 24 2016 Jiffin Tony Thottan <jhottan@redhat.com>
a3470f
 - remove S31ganesha-reset.sh from hooks (#1397795)
a3470f
 
a3470f
+* Fri Nov 18 2016 Soumya Koduri <skoduri@redhat.com>
a3470f
+- As an interim fix add dependency on netstat(/net-tools) for glusterfs-ganesha package (#1395574)
a3470f
+
a3470f
+* Fri Nov 11 2016 Soumya Koduri <skoduri@redhat.com>
a3470f
+- Add dependency on portblock resource agent for ganesha package (#1278336)
a3470f
+- Fix incorrect Requires for portblock resource agent (#1278336)
a3470f
+- Update version checks for portblock resource agent on RHEL (#1278336)
a3470f
+
a3470f
 * Fri Oct 14 2016 Milind Changire <mchangir@redhat.com>
a3470f
 - Changed pretrans scripts to use os.tmpname() for enhanced security
a3470f
   for server builds only (#1362044)
a3470f
-- 
a3470f
1.8.3.1
a3470f