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