|
 |
e3c68b |
From 58bc818f19cbc8e4dd97097dc3e4ec7af8fa8d4a Mon Sep 17 00:00:00 2001
|
|
|
e3c68b |
From: Rinku Kothiya <rkothiya@redhat.com>
|
|
|
e3c68b |
Date: Tue, 7 May 2019 05:35:11 +0000
|
|
|
e3c68b |
Subject: [PATCH 193/221] spec: fixed python dependency for rhel6
|
|
|
e3c68b |
|
|
|
e3c68b |
Installing redhat-storage-server was failing with python dependency
|
|
|
e3c68b |
for glusterfs-geo-replication package. This patch conditionally sets
|
|
|
e3c68b |
the python version for rhel7 and fixes the problem.
|
|
|
e3c68b |
|
|
|
e3c68b |
Label: DOWNSTREAM ONLY
|
|
|
e3c68b |
|
|
|
e3c68b |
BUG: 1704207
|
|
|
e3c68b |
|
|
|
e3c68b |
Change-Id: Ie3b079fd1ccfa6fd2cbf5b08b7a70bd03f090e01
|
|
|
e3c68b |
fixes: bz#1704207
|
|
|
e3c68b |
Signed-off-by: Rinku Kothiya <rkothiya@redhat.com>
|
|
|
e3c68b |
Reviewed-on: https://code.engineering.redhat.com/gerrit/169555
|
|
|
e3c68b |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
e3c68b |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
e3c68b |
---
|
|
|
e3c68b |
glusterfs.spec.in | 4 ++++
|
|
|
e3c68b |
1 file changed, 4 insertions(+)
|
|
|
e3c68b |
|
|
|
e3c68b |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
e3c68b |
index c505cd9..1150101 100644
|
|
|
e3c68b |
--- a/glusterfs.spec.in
|
|
|
e3c68b |
+++ b/glusterfs.spec.in
|
|
|
e3c68b |
@@ -500,7 +500,11 @@ Summary: GlusterFS Geo-replication
|
|
|
e3c68b |
Requires: %{name}%{?_isa} = %{version}-%{release}
|
|
|
e3c68b |
Requires: %{name}-server%{?_isa} = %{version}-%{release}
|
|
|
e3c68b |
Requires: python%{_pythonver}
|
|
|
e3c68b |
+%if ( 0%{?rhel} && 0%{?rhel} < 7 )
|
|
|
e3c68b |
+Requires: python-prettytable
|
|
|
e3c68b |
+%else
|
|
|
e3c68b |
Requires: python%{_pythonver}-prettytable
|
|
|
e3c68b |
+%endif
|
|
|
e3c68b |
Requires: python%{_pythonver}-gluster = %{version}-%{release}
|
|
|
e3c68b |
|
|
|
e3c68b |
Requires: rsync
|
|
|
e3c68b |
--
|
|
|
e3c68b |
1.8.3.1
|
|
|
e3c68b |
|