233933
From 6d6841a996a52488e8a18606f386bba0a12b4231 Mon Sep 17 00:00:00 2001
233933
From: Soumya Koduri <skoduri@redhat.com>
233933
Date: Fri, 18 Nov 2016 12:47:06 +0530
233933
Subject: [PATCH 082/124] build: Add dependency on netstat for
233933
 glusterfs-ganesha pkg
233933
233933
portblock resource-agent needs netstat command but this dependency
233933
should have been ideally added to resource-agents package. But the
233933
fixes (bug1395594, bug1395596) are going to be available only
233933
in the future RHEL 6.9 and RHEL 7.4 releases. Hence as an interim
233933
workaround, we agreed to add this dependency for glusterfs-ganesha package.
233933
233933
label : DOWNSTREAM ONLY
233933
233933
Change-Id: I6ac1003103755d7534dd079c821bbaacd8dd94b8
233933
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
233933
Reviewed-on: https://code.engineering.redhat.com/gerrit/167167
233933
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
233933
Tested-by: RHGS Build Bot <nigelb@redhat.com>
233933
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
233933
---
233933
 glusterfs.spec.in | 14 ++++++++++++++
233933
 1 file changed, 14 insertions(+)
233933
233933
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
233933
index e55e255..bc27058 100644
233933
--- a/glusterfs.spec.in
233933
+++ b/glusterfs.spec.in
233933
@@ -466,6 +466,12 @@ Requires:         pcs, dbus
233933
 Requires:         cman, pacemaker, corosync
233933
 %endif
233933
 
233933
+%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 5 )
233933
+# we need portblock resource-agent in 3.9.5 and later.
233933
+Requires:         resource-agents >= 3.9.5
233933
+Requires:         net-tools
233933
+%endif
233933
+
233933
 %if ( 0%{?fedora} && 0%{?fedora} > 25 )
233933
 Requires: selinux-policy >= 3.13.1-160
233933
 Requires(post):   policycoreutils-python-utils
233933
@@ -1951,6 +1957,14 @@ fi
233933
 %endif
233933
 
233933
 %changelog
233933
+* Sun Apr 7 2019 Soumya Koduri <skoduri@redhat.com>
233933
+- As an interim fix add dependency on netstat(/net-tools) for glusterfs-ganesha package (#1395574)
233933
+
233933
+* Sun Apr 7 2019 Soumya Koduri <skoduri@redhat.com>
233933
+- Add dependency on portblock resource agent for ganesha package (#1278336)
233933
+- Fix incorrect Requires for portblock resource agent (#1278336)
233933
+- Update version checks for portblock resource agent on RHEL (#1278336)
233933
+
233933
 * Sat Apr 6 2019 Jiffin Tony Thottan <jthottan@redhat.com>
233933
 - Adding ganesha ha resources back in gluster repository
233933
 
233933
-- 
233933
1.8.3.1
233933