From 5ac98aab342cf8e33a1896df3726708e6e6d1cfd Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 27 Mar 2018 21:33:56 +0100 Subject: [PATCH] - more python2 fixes for #1552079 --- subversion-1.9.7-pybinary.patch | 9 --------- subversion.spec | 2 ++ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/subversion-1.9.7-pybinary.patch b/subversion-1.9.7-pybinary.patch index c89180d..57482df 100644 --- a/subversion-1.9.7-pybinary.patch +++ b/subversion-1.9.7-pybinary.patch @@ -17,15 +17,6 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1552079 standalone.close() --- subversion-1.9.7/subversion/tests/cmdline/svntest/main.py.pybinary +++ subversion-1.9.7/subversion/tests/cmdline/svntest/main.py -@@ -126,7 +126,7 @@ - if windows: - svneditor_script = os.path.join(sys.path[0], 'svneditor.bat') - else: -- svneditor_script = os.path.join(sys.path[0], 'svneditor.py') -+ svneditor_script = sys.executable + ' ' + os.path.join(sys.path[0], 'svneditor.py') - - # Username and password used by the working copies - wc_author = 'jrandom' @@ -410,9 +410,9 @@ should be passed to wait_on_pipe.""" command = [str(x) for x in command] diff --git a/subversion.spec b/subversion.spec index ca368ae..92aab9d 100644 --- a/subversion.spec +++ b/subversion.spec @@ -232,6 +232,8 @@ PATH=/usr/bin:$PATH ./autogen.sh --release # fix shebang lines, #111498 perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in +# fix python executable +perl -pi -e 's|/usr/bin/env python.*|%{svn_python}|' subversion/tests/cmdline/svneditor.py # override weird -shrext from ruby export svn_cv_ruby_link="%{__cc} -shared"