Updates for CentOS 8

centos/SPECS/git.spec

@@ -34,7 +34,7 @@
 %endif
 
 # Build gnome-keyring git-credential helper on Fedora and RHEL >= 7
-%if 0%{?fedora} || 0%{?rhel} >= 7
+%if 0%{?fedora} || 0%{?rhel} == 7
 %global gnome_keyring 1
 %else
 %global gnome_keyring 0
@@ -47,7 +47,7 @@
 %endif
 
 Name:           git
-Version:        2.21.0
+Version:        2.23.0
 Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
@@ -78,7 +78,12 @@ BuildRequires:  expat-devel
 BuildRequires:  gettext
 BuildRequires:  %{libcurl_devel}
 %if %{gnome_keyring}
+%if 0%{?fedora} || 0%{?rhel} <= 7
 BuildRequires:  libgnome-keyring-devel
+%else
+BuildRequires:  gnome-keyring
+BuildRequires:  gtk3-devel
+%endif
 %endif
 BuildRequires:  pcre2-devel
 BuildRequires:  openssl-devel
@@ -88,6 +93,7 @@ BuildRequires:  zlib-devel >= 1.2
 BuildRequires:  systemd
 %endif
 
+BuildRequires:  platform-python-devel
 Requires:       less
 Requires:       openssh-clients
 Requires:       perl(Error)
@@ -190,7 +196,11 @@ Group:          Development/Tools
 %if %{noarch_sub}
 BuildArch:      noarch
 %endif
+%if 0%{?rhel} >= 8
+BuildRequires:  python36
+%else
 BuildRequires:  python
+%endif
 Requires:       git = %{version}-%{release}
 %description p4
 %{summary}.
@@ -277,6 +287,18 @@ Perl interface to Git.
 %setup -q
 %patch1 -p1
 
+# Fix pyton path for python 3.6:
+for f in \
+contrib/hooks/multimail/git_multimail.py \
+contrib/hooks/multimail/migrate-mailhook-config \
+contrib/hooks/multimail/post-receive.example \
+contrib/hg-to-git/hg-to-git.py \
+contrib/fast-import/import-zips.py \
+Documentation/RelNotes/1.7.0.5.txt \
+git-instaweb.sh git-p4.py; do 
+	pathfix.py -pni /usr/bin/python3 $f 
+done
+
 %if %{use_prebuilt_docs}
 mkdir -p prebuilt_docs/{html,man}
 tar xf %{SOURCE10} -C prebuilt_docs/man
@@ -431,9 +453,10 @@ install -pm 644 contrib/completion/git-completion.tcsh \
 
 # Move contrib/hooks out of %%docdir and make them executable
 mkdir -p %{buildroot}%{_datadir}/git-core/contrib
-mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib
+cp -a contrib/hooks %{buildroot}%{_datadir}/git-core/contrib
 chmod +x %{buildroot}%{_datadir}/git-core/contrib/hooks/*
 pushd contrib > /dev/null
+rm -rf hooks
 ln -s ../../../git-core/contrib/hooks
 popd > /dev/null
 
@@ -482,6 +505,7 @@ rm -rf %{buildroot}
 %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css}
 %{!?_without_docs: %doc Documentation/howto Documentation/technical}
 %{_sysconfdir}/bash_completion.d
+%{_pkgdocdir}-%{version}/*
 
 %files bzr
 %defattr(-,root,root)