From 4ba1cd455b44be717981d14591edd11ec802ee3f Mon Sep 17 00:00:00 2001
From: basebuilder_pel7ppc64bebuilder0 <basebuilder@powerel.org>
Date: Fri, 24 Aug 2018 00:33:24 +0200
Subject: [PATCH] git package update 2.18.0

Signed-off-by: basebuilder_pel7ppc64bebuilder0 <basebuilder@powerel.org>
---
 SPECS/git.spec | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/SPECS/git.spec b/SPECS/git.spec
index fc7b3963..c0ef2fe8 100644
--- a/SPECS/git.spec
+++ b/SPECS/git.spec
@@ -54,7 +54,7 @@
 %endif
 
 Name:           git
-Version:        2.17.1
+Version:        2.18.0
 Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
@@ -108,6 +108,7 @@ BuildRequires:  %{libcurl_devel}
 BuildRequires:  libgnome-keyring-devel
 %endif
 BuildRequires:  pcre-devel
+BuildRequires:  pcre2-devel
 #BuildRequires:  perl-generators
 BuildRequires:  perl(Test)
 BuildRequires:  openssl-devel
@@ -444,7 +445,7 @@ make %{?_smp_mflags} all
 make %{?_smp_mflags} doc
 %endif
 
-make -C contrib/emacs
+#make -C contrib/emacs
 
 %if %{gnome_keyring}
 make -C contrib/credential/gnome-keyring/
@@ -470,15 +471,15 @@ cp -a prebuilt_docs/html/* Documentation/
 %global _emacs_sitelispdir %{_datadir}/emacs/site-lisp
 %global _emacs_sitestartdir %{_emacs_sitelispdir}/site-start.d
 %endif
-%global elispdir %{_emacs_sitelispdir}/git
-make -C contrib/emacs install \
-    emacsdir=%{buildroot}%{elispdir}
-for elc in %{buildroot}%{elispdir}/*.elc ; do
-    install -pm 644 contrib/emacs/$(basename $elc .elc).el \
-    %{buildroot}%{elispdir}
-done
-install -Dpm 644 %{SOURCE10} \
-    %{buildroot}%{_emacs_sitestartdir}/git-init.el
+#%global elispdir %{_emacs_sitelispdir}/git
+#make -C contrib/emacs install \
+#    emacsdir=%{buildroot}%{elispdir}
+#for elc in %{buildroot}%{elispdir}/*.elc ; do
+#    install -pm 644 contrib/emacs/$(basename $elc .elc).el \
+#    %{buildroot}%{elispdir}
+#done
+#install -Dpm 644 %{SOURCE10} \
+#    %{buildroot}%{_emacs_sitestartdir}/git-init.el
 
 %if %{gnome_keyring}
 install -pm 755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \
@@ -608,7 +609,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
 %{elispdir}
-%{_emacs_sitestartdir}/git-init.el
+#%{_emacs_sitestartdir}/git-init.el
 %endif
 %{_datadir}/git-core/contrib/hooks/update-paranoid
 %{_datadir}/git-core/contrib/hooks/setgitperms.perl
@@ -722,9 +723,9 @@ rm -rf %{buildroot}
 %files -n emacs-git
 %defattr(-,root,root)
 %doc contrib/emacs/README
-%dir %{elispdir}
+#%dir %{elispdir}
 %{elispdir}/*.elc
-%{_emacs_sitestartdir}/git-init.el
+#%{_emacs_sitestartdir}/git-init.el
 
 %files -n emacs-git-el
 %defattr(-,root,root)