Fix up bare 'python' to be python2

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
Stephen Gallagher 2018-05-29 08:21:46 -04:00
parent 733d54662f
commit ed12bdf970
No known key found for this signature in database
GPG key ID: 7A25556236BAA3A3

View file

@ -287,6 +287,13 @@ rm -rf deps/icu-small \
%patch4 -p1 %patch4 -p1
# Replace any instances of unversioned python' with python2
find . -type f -exec sed -i "s~/usr\/bin\/env python~/usr/bin/python2~" {} \;
find . -type f -exec sed -i "s~/usr\/bin\/python\W~/usr/bin/python2~" {} \;
find . -type f -exec sed -i "s~/usr\/bin\/python\W~/usr/bin/python2~" {} \;
find . -type f -exec sed -i "s~python -c~python2 -c~" {} \;
sed -i "s~which('python')~which('python2')~" configure
%build %build
# build with debugging symbols and add defines from libuv (#892601) # build with debugging symbols and add defines from libuv (#892601)
# Node's v8 breaks with GCC 6 because of incorrect usage of methods on # Node's v8 breaks with GCC 6 because of incorrect usage of methods on
@ -308,11 +315,6 @@ export CXXFLAGS="$(echo ${CXXFLAGS} | tr '\n\\' ' ')"
export LDFLAGS="%{build_ldflags}" export LDFLAGS="%{build_ldflags}"
# Work around Fedora 28 issue:
# https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build#Quick_Opt-Out
# Tracking BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1550564
export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0
#%if ! 0%%{?bootstrap} #%if ! 0%%{?bootstrap}
%if %{with bootstrap} %if %{with bootstrap}
./configure --prefix=%{_prefix} \ ./configure --prefix=%{_prefix} \
@ -489,7 +491,6 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -
%files docs %files docs
%dir %{_pkgdocdir} %dir %{_pkgdocdir}
%{_pkgdocdir}/html %{_pkgdocdir}/html
%{_pkgdocdir}/npm*
%{_pkgdocdir}/npm/html %{_pkgdocdir}/npm/html
%{_pkgdocdir}/npm/doc %{_pkgdocdir}/npm/doc