rpms/subversion
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- more python2 fixes for #1552079

Browse Source
This commit is contained in:
Joe Orton 2018-03-27 21:33:56 +01:00
parent 98ddd79d86
commit 5ac98aab34
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
subversion-1.9.7-pybinary.patch
View File

@ -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]

2
subversion.spec
View File

@ -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"