From 1a5f31bc54bbcd04e2e27859c1f37a74da4e28f3 Mon Sep 17 00:00:00 2001 From: Felix Dallidet Date: Thu, 28 May 2020 11:19:42 +0200 Subject: [PATCH] fixup! Fixes #17536: Change all python3 scripts to python2 on rhel7 at build time Fixes #17536: Change all python3 scripts to python2 on rhel7 at build time --- rudder-agent/SPECS/rudder-agent.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rudder-agent/SPECS/rudder-agent.spec b/rudder-agent/SPECS/rudder-agent.spec index 19c8c78db..7c62a11da 100644 --- a/rudder-agent/SPECS/rudder-agent.spec +++ b/rudder-agent/SPECS/rudder-agent.spec @@ -307,11 +307,6 @@ FusionInventory. cd %{_sourcedir} -# rhel7 doesn't have python 3 so we force python2 instead -%if 0%{?rhel} == 7 || ( 0%{?suse_version} && 0%{?suse_version} < 1500 ) -find . -type f | xargs sed -i '1,1s|#!/usr/bin/python3|#!/usr/bin/python2|' -%endif - # libattr libtool file is looked for in /lib64 but put in /usr/lib64 on RHEL3 %if 0%{?rhel} && 0%{?rhel} < 4 cp /usr/lib64/libattr.a /usr/lib64/libattr.la /lib64 || cp /usr/lib/libattr.a /usr/lib/libattr.la /lib @@ -319,6 +314,11 @@ cp /usr/lib64/libattr.a /usr/lib64/libattr.la /lib64 || cp /usr/lib/libattr.a /u make BUILD_CFLAGS="${RPM_OPT_FLAGS}" USE_SYSTEM_OPENSSL=%{use_system_openssl} BUILD_OLD_OPENSSL=%{build_old_openssl} USE_SYSTEM_LMDB=%{use_system_lmdb} USE_SYSTEM_PCRE=%{use_system_pcre} USE_SYSTEM_FUSION=%{use_system_fusion} USE_SYSTEM_PERL=%{use_system_perl} USE_HTTPS=%{use_https} USE_SYSTEM_ZLIB=%{use_system_zlib} USE_SYSTEM_CURL=%{use_system_curl} USE_SYSTEM_YAML=%{use_system_yaml} USE_SYSTEM_XML=%{use_system_xml} USE_PIE=%{use_pie} USE_ACL=%{use_acl} +# rhel7 doesn't have python 3 so we force python2 instead +%if 0%{?rhel} == 7 || ( 0%{?suse_version} && 0%{?suse_version} < 1500 ) +find . -type f | xargs sed -i '1,1s|#!/usr/bin/python3|#!/usr/bin/python2|' +%endif + #================================================= # Installation #=================================================