public/rpms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build is now possible on CentOS 7 and 8

Browse Source
This commit is contained in:
dani
2019-11-22 10:31:15 +01:00
parent 5116700d38
commit 893186b6a3
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
centos/SPECS/git.spec
View File

@@ -99,7 +99,9 @@ BuildRequires: zlib-devel >= 1.2
BuildRequires: systemd BuildRequires: systemd
%endif %endif
%if 0%{?fedora} || 0%{?rhel} >= 8
BuildRequires: platform-python-devel BuildRequires: platform-python-devel
%endif
Requires: less Requires: less
Requires: openssh-clients Requires: openssh-clients
Requires: perl(Error) Requires: perl(Error)
@@ -294,6 +296,7 @@ Perl interface to Git.
%patch1 -p1 %patch1 -p1
# Fix pyton path for python 3.6: # Fix pyton path for python 3.6:
%if 0%{?fedora} || 0%{?rhel} >= 8
for f in \ for f in \
contrib/hooks/multimail/git_multimail.py \ contrib/hooks/multimail/git_multimail.py \
contrib/hooks/multimail/migrate-mailhook-config \ contrib/hooks/multimail/migrate-mailhook-config \
@@ -304,6 +307,7 @@ Documentation/RelNotes/1.7.0.5.txt \
git-instaweb.sh git-p4.py; do git-instaweb.sh git-p4.py; do
pathfix.py -pni /usr/bin/python3 $f pathfix.py -pni /usr/bin/python3 $f
done done
%endif
%if %{use_prebuilt_docs} %if %{use_prebuilt_docs}
mkdir -p prebuilt_docs/{html,man} mkdir -p prebuilt_docs/{html,man}
@@ -511,7 +515,11 @@ rm -rf %{buildroot}
%{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css}
%{!?_without_docs: %doc Documentation/howto Documentation/technical} %{!?_without_docs: %doc Documentation/howto Documentation/technical}
%{_sysconfdir}/bash_completion.d %{_sysconfdir}/bash_completion.d
%if 0%{?fedora} || 0%{?rhel} >= 8
%{_pkgdocdir}-%{version}/* %{_pkgdocdir}-%{version}/*
%else
%{_pkgdocdir}/*
%endif
%files bzr %files bzr
%defattr(-,root,root) %defattr(-,root,root)