From ef7ac1a89e4939fe6682df2f3db67086ded5ad35 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 3 Aug 2017 18:10:21 -0400 Subject: [PATCH] git-p4: adjust python2 shebang manually Setting 'PYTHON_PATH = %{__python2}' in config.mak should work, but doing so causes the remote svn tests in t9020 (which use a python script to similate svnrdump) to fail. Just fix the git-p4 shebang until the svn test failures can be resolved. --- git.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index cde985f..08a506f 100644 --- a/git.spec +++ b/git.spec @@ -363,7 +363,6 @@ DESTDIR = %{buildroot} INSTALL = install -p GITWEB_PROJECTROOT = %{_localstatedir}/lib/git GNU_ROFF = 1 -PYTHON_PATH = %{__python2} htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} prefix = %{_prefix} gitwebdir = %{_localstatedir}/www/git @@ -449,6 +448,11 @@ make -C contrib/credential/libsecret/ clean install -pm 755 contrib/credential/netrc/git-credential-netrc \ %{buildroot}%{gitcoredir} +# Replace shebang in git-p4. Setting PYTHON_PATH = %{__python2} in config.mak +# should be the way to do this, but that causes the python-based remote svn +# tests in t9020 to fail. +sed -i -e '1s|#!.*python|#!%{__python2}|' %{buildroot}%{gitcoredir}/git-p4 + make -C contrib/subtree install make -C contrib/subtree install-doc