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