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