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