From 8030e8582037b45d36808c0f2a6640cf93cd987dcd0b45c1024881707fcbc6cd Mon Sep 17 00:00:00 2001
From: Yuchen Lin <mlin+factory@suse.de>
Date: Sun, 6 Aug 2017 09:25:53 +0000
Subject: [PATCH] Accepting request 514712 from devel:tools:scm

git 2.14.0

OBS-URL: https://build.opensuse.org/request/show/514712
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=201
---
 git-2.13.3.tar.sign | Bin 543 -> 0 bytes
 git-2.13.3.tar.xz   |   3 ---
 git-2.14.0.tar.sign | Bin 0 -> 543 bytes
 git-2.14.0.tar.xz   |   3 +++
 git.changes         |  21 +++++++++++++++++++++
 git.spec            |   6 +++---
 6 files changed, 27 insertions(+), 6 deletions(-)
 delete mode 100644 git-2.13.3.tar.sign
 delete mode 100644 git-2.13.3.tar.xz
 create mode 100644 git-2.14.0.tar.sign
 create mode 100644 git-2.14.0.tar.xz

diff --git a/git-2.13.3.tar.sign b/git-2.13.3.tar.sign
deleted file mode 100644
index 94959924bf3339fa1af8a1b93234cd46c0050eede6e8b66af0c1f580723c2d84..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3L0vrSY0RjL91p--Ssu%zY2@tTg=!TZB=F6j}5CFMq$=7@o2ysalUBRuO
z6x%b4131EB`p){-O-i=<ZJfP}jNLo7rO*E<ZtkG4M?vcl7QyA4pIV3pP+KYtT88|^
z?PU;mb;cey;ed*Hy%wm%Znzn_VRn5B@X}EuDP2jHZqf|isX)v`@Z*Zzn{7=yVacC)
zWB69CeKhDlTl!nm8%(e*te1O|Gjqk6bgD`?PDiP6OqPqcEGC+4R|!^;vy&I61|3>@
zD42G+NHqB>2qb@l+sN%;^sCWbq*McCC(;;2d(UnaI+j()BxNXmb8?|oA(@y7BZxmL
zJ;3fZSoWx@;t_iu8`unp2T*4CV#dG7o%15jWti%ei0J4-W)9Ek*k#cKV0L8r16X_E
z%D_1w60_7ynDSJ}K?<w#o0`_S>Slssgk}mnASn_O1DlxATqDGB{E`H)V8Uit!O)k4
zBt7&5o@^U4Rcx8udCx2tx_;bQa4WU44#I#$?-BXYJWxF+`Q%UxeDQzYEHWpG#Oq&F
zuYg+~21d?w+S?)M#ZRLQ2j`uqZ)m&tn|`8SL<@P3t57x5>pGW?9V<%=^OSM978%Eo
zneW%#!U$CQ-}GAEy#48ZIk)_So#8^>ql-#=GzFO;tNIto?a<{}aBbrTbWjHPC)zfE
hW6-DPR8{$IvPI@2N*l#xj&3!_`O6SFv1KsV+h<r72;l$#

diff --git a/git-2.13.3.tar.xz b/git-2.13.3.tar.xz
deleted file mode 100644
index 02952e0..0000000
--- a/git-2.13.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:91aa23be428f67eb19616f43fa0229d567e9acf4f08fba33eb0b627e4d323e62
-size 4754532
diff --git a/git-2.14.0.tar.sign b/git-2.14.0.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..3a07df5fb9d3c0a3168d5af6aab661e6af76f858367273aef093e0b061abccfd
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0SEvF1p--wr3?TH2@tTg=!TZB=F3W65C48WSUIcQ@9YRb94^M1
zN|&BAi2bS&@AA?A$Q>PH4ZY(#-!`M(CpnS70iDd>KU<!4E3*q{AfcHXC;-YHb531Q
zCp~7V(k%u=9PEW)<At8-%cx)3v29><#5Y#QT7<PXSHN&|&;4#3_*p8drJ!Dawp&^A
zyD*sQLB2BPpl#uI;fIyMvoE+3!a(Rkdeko<oA4-o1|5B&aYLm4Zi5`;qKZei--LYp
zke-Muq#>mp{BPp@%bHlntR~O$V8pAcmwwPd7YSN^&Ub6?wf@}?BY-`p2xTd_@Vfgg
z?e}#3nK$7v8dw1cKZMixW1gc8`%F-ZL(GqKaZhE$KF(-7f==_8j6An4ay1QjY*kor
zkk)Mqk<@`Y)n|2XI#~s`d(U+T1@|QWxwM}U;RS5W>3q^D^n4kc$T>SZL`F>mYh8hU
zJ7|_4X+z*K%0{ku*PVC^PX}~OcY|C3sI44hIv22H+<=j+csK8eCmo_WSl?Rnc2xS^
zhj$RcZ<SXRLs_lWcXKmrcEo?l6>kkY8H$sB$NtF1_GQaPfP6>8CTecf@xR9D8-C{_
zXpRP#HZ)A)UvIB4*`YlpjzJQFl#0*2O^#5s__$UuYVM)@q`G+DS0y8JCUMV^%#Mt5
hzz7ROMv7Jplk_0^=+*JEipvoK3S3n;9qZ0%bMhKr2X6oX

literal 0
HcmV?d00001

diff --git a/git-2.14.0.tar.xz b/git-2.14.0.tar.xz
new file mode 100644
index 0000000..7bf1777
--- /dev/null
+++ b/git-2.14.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f93e6e6a307d2e953cccafd9f4003c62992628fa508d07586476c953c1655975
+size 4790932
diff --git a/git.changes b/git.changes
index f0a2f21..87b38e1 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Sat Aug  5 14:23:43 UTC 2017 - astieger@suse.com
+
+- git 2.14.0:
+  * Use of an empty string as a pathspec element that is used for
+    'everything matches' is deprecated, use '.'
+  * Avoid blindly falling back to ".git" when the setup sequence
+    indicates operation not on a Git repository
+  * "indent heuristics" are now the default.
+  * Builds with pcre2
+  * Many bug fixes, improvements and updates
+
+-------------------------------------------------------------------
+Wed Aug  2 00:34:01 UTC 2017 - astieger@suse.com
+
+- git 2.13.4:
+  * Update the character width tables.
+  * Fix an alias that contained an uppercase letter
+  * Progress meter fixes
+  * git gc concurrency fixes
+
 -------------------------------------------------------------------
 Thu Jul 13 09:08:26 UTC 2017 - astieger@suse.com
 
diff --git a/git.spec b/git.spec
index 62d715d..52113ae 100644
--- a/git.spec
+++ b/git.spec
@@ -26,7 +26,7 @@
 %endif
 
 Name:           git
-Version:        2.13.3
+Version:        2.14.0
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0
@@ -67,7 +67,7 @@ BuildRequires:  libexpat-devel
 BuildRequires:  libgnome-keyring-devel
 %endif
 BuildRequires:  libopenssl-devel
-BuildRequires:  pcre-devel
+BuildRequires:  pcre2-devel
 BuildRequires:  perl-Error
 BuildRequires:  python
 BuildRequires:  sgml-skel
@@ -259,7 +259,7 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
        DESTDIR=$RPM_BUILD_ROOT \
        NO_CROSS_DIRECTORY_HARDLINKS=1 \
        NO_INSTALL_HARDLINKS=1 \
-       USE_LIBPCRE=1 \
+       USE_LIBPCRE2=YesPlease \
        V=1 \
        prefix=%{_prefix} mandir=%{_mandir} \
        gitexecdir=%{gitexecdir} \