|
 |
50dc83 |
From 2e6241a800c98ba95b3420255d8089e0271b46eb Mon Sep 17 00:00:00 2001
|
|
|
50dc83 |
From: Sunil Kumar Acharya <sheggodu@redhat.com>
|
|
|
50dc83 |
Date: Thu, 6 Jun 2019 16:18:26 +0530
|
|
|
50dc83 |
Subject: [PATCH 169/169] Build: Fix spec to enable rhel8 client build
|
|
|
50dc83 |
|
|
|
50dc83 |
Updated the spec file with required changes to enable RHGS RHEL8
|
|
|
50dc83 |
client build. As Ganesha scripts are not python3 compatible, we
|
|
|
50dc83 |
will not be generating RHGS RHEL8 server build until the required
|
|
|
50dc83 |
changes are backported from upstream.
|
|
|
50dc83 |
|
|
|
50dc83 |
Label : DOWNSTREAM ONLY
|
|
|
50dc83 |
|
|
|
50dc83 |
BUG: 1717927
|
|
|
50dc83 |
Change-Id: I2a8d37d24405a8b2d5533ebf7b85327485f810d7
|
|
|
50dc83 |
Signed-off-by: Sunil Kumar Acharya <sheggodu@redhat.com>
|
|
|
50dc83 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/172668
|
|
|
50dc83 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
50dc83 |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
50dc83 |
---
|
|
|
50dc83 |
glusterfs.spec.in | 10 ++++------
|
|
|
50dc83 |
1 file changed, 4 insertions(+), 6 deletions(-)
|
|
|
50dc83 |
|
|
|
50dc83 |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
50dc83 |
index 85e75f2..9c7d7a7 100644
|
|
|
50dc83 |
--- a/glusterfs.spec.in
|
|
|
50dc83 |
+++ b/glusterfs.spec.in
|
|
|
50dc83 |
@@ -91,7 +91,7 @@
|
|
|
50dc83 |
|
|
|
50dc83 |
# disable server components forcefully as rhel <= 6
|
|
|
50dc83 |
%if ( 0%{?rhel} )
|
|
|
50dc83 |
-%if (!(( "%{?dist}" == ".el6rhs" ) || ( "%{?dist}" == ".el7rhs" ) || ( "%{?dist}" == ".el7rhgs" )))
|
|
|
50dc83 |
+%if (!(( "%{?dist}" == ".el6rhs" ) || ( "%{?dist}" == ".el7rhs" ) || ( "%{?dist}" == ".el7rhgs" ) || ( "%{?dist}" == ".el8rhgs" )))
|
|
|
50dc83 |
%global _without_server --without-server
|
|
|
50dc83 |
%endif
|
|
|
50dc83 |
%endif
|
|
|
50dc83 |
@@ -270,7 +270,7 @@ BuildRequires: python%{_pythonver}-devel
|
|
|
50dc83 |
%if ( 0%{?rhel} && 0%{?rhel} < 8 )
|
|
|
50dc83 |
BuildRequires: python-ctypes
|
|
|
50dc83 |
%endif
|
|
|
50dc83 |
-%if ( 0%{?_with_ipv6default:1} ) || ( 0%{!?_without_libtirpc:1} )
|
|
|
50dc83 |
+%if ( 0%{?_with_ipv6default:1} ) || ( 0%{!?_without_libtirpc:1} ) || ( 0%{?rhel} && ( 0%{?rhel} >= 8 ) )
|
|
|
50dc83 |
BuildRequires: libtirpc-devel
|
|
|
50dc83 |
%endif
|
|
|
50dc83 |
%if ( 0%{?fedora} && 0%{?fedora} > 27 ) || ( 0%{?rhel} && 0%{?rhel} > 7 )
|
|
|
50dc83 |
@@ -722,12 +722,10 @@ GlusterFS Events
|
|
|
50dc83 |
|
|
|
50dc83 |
%prep
|
|
|
50dc83 |
%setup -q -n %{name}-%{version}%{?prereltag}
|
|
|
50dc83 |
-%if ( ! %{_usepython3} )
|
|
|
50dc83 |
echo "fixing python shebangs..."
|
|
|
50dc83 |
-for f in api events extras geo-replication libglusterfs tools xlators; do
|
|
|
50dc83 |
-find $f -type f -exec sed -i 's|/usr/bin/python3|/usr/bin/python2|' {} \;
|
|
|
50dc83 |
+for i in `find . -type f -exec bash -c "if file {} | grep 'Python script, ASCII text executable' >/dev/null; then echo {}; fi" ';'`; do
|
|
|
50dc83 |
+ sed -i -e 's|^#!/usr/bin/python.*|#!%{__python3}|' -e 's|^#!/usr/bin/env python.*|#!%{__python3}|' $i
|
|
|
50dc83 |
done
|
|
|
50dc83 |
-%endif
|
|
|
50dc83 |
|
|
|
50dc83 |
%build
|
|
|
50dc83 |
|
|
|
50dc83 |
--
|
|
|
50dc83 |
1.8.3.1
|
|
|
50dc83 |
|