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