rpms/git
6
0
Fork 0
Code Issues Pull Requests Releases Activity

git-p4: adjust python2 shebang manually

Browse Source 
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.
This commit is contained in:
Todd Zullinger 2017-08-03 18:10:21 -04:00
parent 3d91c7b1f2
commit ef7ac1a89e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git.spec
View File

@ -363,7 +363,6 @@ DESTDIR = %{buildroot}
INSTALL = install -p INSTALL = install -p
GITWEB_PROJECTROOT = %{_localstatedir}/lib/git GITWEB_PROJECTROOT = %{_localstatedir}/lib/git
GNU_ROFF = 1 GNU_ROFF = 1
PYTHON_PATH = %{__python2}
htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
prefix = %{_prefix} prefix = %{_prefix}
gitwebdir = %{_localstatedir}/www/git gitwebdir = %{_localstatedir}/www/git
@ -449,6 +448,11 @@ make -C contrib/credential/libsecret/ clean
install -pm 755 contrib/credential/netrc/git-credential-netrc \ install -pm 755 contrib/credential/netrc/git-credential-netrc \
%{buildroot}%{gitcoredir} %{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
make -C contrib/subtree install-doc make -C contrib/subtree install-doc