From 893186b6a3d93139a0c330f47bb7b5baf0f96a57 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 22 Nov 2019 10:31:15 +0100 Subject: [PATCH] Build is now possible on CentOS 7 and 8 --- centos/SPECS/git.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/centos/SPECS/git.spec b/centos/SPECS/git.spec index 209bbd4..926464d 100644 --- a/centos/SPECS/git.spec +++ b/centos/SPECS/git.spec @@ -99,7 +99,9 @@ BuildRequires: zlib-devel >= 1.2 BuildRequires: systemd %endif +%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: platform-python-devel +%endif Requires: less Requires: openssh-clients Requires: perl(Error) @@ -294,6 +296,7 @@ Perl interface to Git. %patch1 -p1 # Fix pyton path for python 3.6: +%if 0%{?fedora} || 0%{?rhel} >= 8 for f in \ contrib/hooks/multimail/git_multimail.py \ contrib/hooks/multimail/migrate-mailhook-config \ @@ -304,6 +307,7 @@ Documentation/RelNotes/1.7.0.5.txt \ git-instaweb.sh git-p4.py; do pathfix.py -pni /usr/bin/python3 $f done +%endif %if %{use_prebuilt_docs} 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/howto Documentation/technical} %{_sysconfdir}/bash_completion.d +%if 0%{?fedora} || 0%{?rhel} >= 8 %{_pkgdocdir}-%{version}/* +%else +%{_pkgdocdir}/* +%endif %files bzr %defattr(-,root,root)