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