9f5ccc
From b9a19aef5de94eb91162448ad687f2d2d194f82c Mon Sep 17 00:00:00 2001
9f5ccc
From: Rinku Kothiya <rkothiya@redhat.com>
9f5ccc
Date: Thu, 14 Nov 2019 09:55:15 +0000
9f5ccc
Subject: [PATCH 316/316] spec: fixed python-prettytable dependency for rhel6
9f5ccc
9f5ccc
Installing glusterfs on rhel6 was failing with python-prettytable
9f5ccc
dependency as it required python2-prettytable for glusterfs-events.
9f5ccc
This patch conditionally sets the python version for rhel7 and
9f5ccc
fixes the problem.
9f5ccc
9f5ccc
Label: DOWNSTREAM ONLY
9f5ccc
9f5ccc
BUG: 1771614
9f5ccc
9f5ccc
Change-Id: I6288daa5d8c2d82a6d73a0d9722786a2a99b9db5
9f5ccc
fixes: bz#1771614
9f5ccc
Signed-off-by: Rinku Kothiya <rkothiya@redhat.com>
9f5ccc
Reviewed-on: https://code.engineering.redhat.com/gerrit/185385
9f5ccc
Tested-by: RHGS Build Bot <nigelb@redhat.com>
9f5ccc
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
9f5ccc
---
9f5ccc
 glusterfs.spec.in | 5 ++++-
9f5ccc
 1 file changed, 4 insertions(+), 1 deletion(-)
9f5ccc
9f5ccc
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
9f5ccc
index 3c2e2dc..eeadb65 100644
9f5ccc
--- a/glusterfs.spec.in
9f5ccc
+++ b/glusterfs.spec.in
9f5ccc
@@ -706,7 +706,7 @@ This package provides the translators needed on any GlusterFS client.
9f5ccc
 %package events
9f5ccc
 Summary:          GlusterFS Events
9f5ccc
 Requires:         %{name}-server%{?_isa} = %{version}-%{release}
9f5ccc
-Requires:         python%{_pythonver} python%{_pythonver}-prettytable
9f5ccc
+Requires:         python%{_pythonver}
9f5ccc
 Requires:         python%{_pythonver}-gluster = %{version}-%{release}
9f5ccc
 %if ( 0%{?rhel} && 0%{?rhel} < 8 )
9f5ccc
 Requires:         python-requests
9f5ccc
@@ -714,7 +714,10 @@ Requires:         python-requests
9f5ccc
 Requires:         python%{_pythonver}-requests
9f5ccc
 %endif
9f5ccc
 %if ( 0%{?rhel} && 0%{?rhel} < 7 )
9f5ccc
+Requires:         python-prettytable
9f5ccc
 Requires:         python-argparse
9f5ccc
+%else
9f5ccc
+Requires:         python%{_pythonver}-prettytable
9f5ccc
 %endif
9f5ccc
 %if ( 0%{?_with_systemd:1} )
9f5ccc
 %{?systemd_requires}
9f5ccc
-- 
9f5ccc
1.8.3.1
9f5ccc