Skip to content
This repository has been archived by the owner on May 16, 2020. It is now read-only.

Commit

Permalink
Merge Fedora fixes to clean up p4 Python dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
carlwgeorge committed Oct 24, 2017
1 parent 6e80354 commit 7ac90aa
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion SPECS/git2u.spec
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ Simple web interface to track changes in git repositories
Summary: Git tools for working with Perforce depots
Group: Development/Tools
BuildArch: noarch
BuildRequires: python
BuildRequires: python2-devel
Requires: %{name} = %{version}-%{release}
Provides: git-p4 = %{version}-%{release}
Conflicts: git-p4 < %{version}
Expand Down Expand Up @@ -423,6 +423,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
%if ! %{use_prebuilt_docs}
make -C contrib/subtree install-doc
Expand Down Expand Up @@ -641,6 +646,7 @@ rm -rf %{buildroot}
%changelog
* Tue Oct 24 2017 Carl George <[email protected]> - 2.14.3-1.ius
- Latest upstream
- Merge Fedora fixes to clean up p4 Python dependency

* Tue Sep 26 2017 Ben Harper <[email protected]> - 2.14.2-1.ius
- Latest upstream
Expand Down

0 comments on commit 7ac90aa

Please sign in to comment.