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