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