From d324862e99033ee73673cf5e37d3bd6f1c3a56ca2fc4187a90b98662c8b4bdcc Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Mon, 5 Sep 2016 19:18:53 +0000
Subject: [PATCH] Accepting request 424692 from devel:tools:scm

1

OBS-URL: https://build.opensuse.org/request/show/424692
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=186
---
 git-2.10.0.tar.sign | Bin 0 -> 543 bytes
 git-2.10.0.tar.xz   |   3 +++
 git-2.9.3.tar.sign  | Bin 543 -> 0 bytes
 git-2.9.3.tar.xz    |   3 ---
 git-asciidoc.patch  |  15 +++++++++++++++
 git-tclIndex.patch  |  19 +++++++++++++++++++
 git.changes         |  16 ++++++++++++++++
 git.spec            |   6 +++++-
 8 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 git-2.10.0.tar.sign
 create mode 100644 git-2.10.0.tar.xz
 delete mode 100644 git-2.9.3.tar.sign
 delete mode 100644 git-2.9.3.tar.xz
 create mode 100644 git-asciidoc.patch
 create mode 100644 git-tclIndex.patch

diff --git a/git-2.10.0.tar.sign b/git-2.10.0.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..d78cc97a9caafe398de73a4fba015cdfb64e75cca797d14ff40bcbe29c09c33d
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0RjL91p-&fF=GG<2@tTg=!TZB=F13P5C3KUE3MYx^s7^Kuwk9|
z;iR3D!_-<vkiYoub3$$;S_va=iNkH^`w4q%?M#gHuCzW_4LQ?Dn9f`fdbRM2h2f*l
zH2+H%GjH7!6R3Dy=ZU_7UrWz^&&Lp@6JmVO75P7<=eA)GTgNAfN;%{*h2&jtgF+O$
z!3|LH*qVN*6e7GVX=JfeGqh*LWg-wd$ddIcXj?TfMH<NN=06v;yh8S4gY^0ya}enZ
zX!xuudeEL=IMYsgG3f!p%2w_&Bg?3Q@<CKtu}{z`U8|j{?<HDkWVC_#YwOxW9&PAj
zZ_Ie(ulqfdK6s~0d*Uejp7|~eb0+#=O(~Ghr#L+Ip+G)azSPJ2+<)(~kPEn;qwmB#
zo3%f-lKIGVtBy>h35jhPa#yF9nsGWo_V-tVep_u)#53#6e>6KN{DM}5^2kpNm=p|b
zyI@@<DM5sWF?1&oE_1f&!>~A)ZCge7L5aPkXX1ctZ(~C8+LuJvp>wI}=BqJF%YYA;
zhyfqCD|-1smEqrbL5%%@<l(v|bvCKfffZ7aNaN+r25|UA!-b%T#xXwUOqYI9Z3)!Q
zU}pTf?rRFXXKOzSyGbz*-i;4wh-~~Nh1Oeee(nLmDL;O&!Ff8o{)~}Y=93N)Rp*BX
hgYD8ETo||OUucKX1}elf6TYJ`SQaJ9?p*=^;N~Dk4xRu2

literal 0
HcmV?d00001

diff --git a/git-2.10.0.tar.xz b/git-2.10.0.tar.xz
new file mode 100644
index 0000000..82f4025
--- /dev/null
+++ b/git-2.10.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c73364ac00ae85ffc6cfb12ca2700bb0edf30f63262be97be4039be594ff29e7
+size 4096264
diff --git a/git-2.9.3.tar.sign b/git-2.9.3.tar.sign
deleted file mode 100644
index 9418964bd01ff282417e93eb2c71d5d5c0f0d9fcdf8cbe266b70e48fd15ec850..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3L0vrSY0RjL91p-&DCU*b|2@tTg=!TZB=F4};5CFSfiQhu+T{OOIlP?w!
z4+x2er7YvL$N4%1&vctxu<n(X$d+;B0FTdxG$RR^1Ca%)`Hd>sd&GPoAkQWV0a-8^
zRAyt?Feb+E?m>p54zlwm@Ru*u)z~zRr|@8s;JeRcXpBW<v6g2clUAVd^lH}#C7ksR
z89#&=Tw>X-W0+;+r|N*vrEj9)k0*V{=Ca64o@d+y8`NYQ3rcq-uzKzZ#-4!FjOdHI
zqrT#DU9$r#uMwR}Gk({G<UNR2mH&A2s&eaH1e^=nQtqd>c)t>C?paUjuc(-Tw4&jM
zP@5r^1Xe8T<E(ELoT#A{C<%6YaZ}?v=W%z0n;(CNeVCivH!=0*pB@L4yfs#Zxc)AY
z?uoOiwJsZKgobrp%zWJ`>pC5s!%T4htnh{_J1a3F2n*4dK*NV0X5^1$PFK<_*@cAz
zd%Qk@5e|XQ1`LPz=6ZrYSkHPcmpAuw92y!uJmXJV%`M&n6(YGdb#D<#by!pC<SR)3
z*1&u&>EfFd24#%t1Lj@Qr)E9hxh@93O!7?hJG@GAEAMkI+@Os+i0zMI6i%tmrlPmx
z5Qyu{0*%?OMh_u5<5c;~FUh4<LgS0T!gY%z+VM(LBZDdnN8+f%xuOJZUJS_=U5IJ%
hXyS$nE1%x~Vf>6a@NY9rAs;DJe!c_*LtS2>koP=d22ub3

diff --git a/git-2.9.3.tar.xz b/git-2.9.3.tar.xz
deleted file mode 100644
index e393863..0000000
--- a/git-2.9.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f1473350c1792310b51af03a9cb5cce841f68202f835b20d46312a30232fa63
-size 4025288
diff --git a/git-asciidoc.patch b/git-asciidoc.patch
new file mode 100644
index 0000000..f68adfd
--- /dev/null
+++ b/git-asciidoc.patch
@@ -0,0 +1,15 @@
+---
+ Documentation/asciidoc.conf |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/Documentation/asciidoc.conf
++++ b/Documentation/asciidoc.conf
+@@ -21,6 +21,8 @@ tilde=&#126;
+ apostrophe=&#39;
+ backtick=&#96;
+ litdd=&#45;&#45;
++# drops the "last-updated" footer, with asciidoc-8.6.9+
++footer-style=none
+ 
+ ifdef::backend-docbook[]
+ [linkgit-inlinemacro]
diff --git a/git-tclIndex.patch b/git-tclIndex.patch
new file mode 100644
index 0000000..a366f10
--- /dev/null
+++ b/git-tclIndex.patch
@@ -0,0 +1,19 @@
+ALL_LIBFILES uses wildcard, which provides the result in directory
+order. This order depends on the underlying filesystem on the
+buildhost. To get reproducible builds it is required to sort such list
+before using them.
+---
+ git-gui/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/git-gui/Makefile
++++ b/git-gui/Makefile
+@@ -259,7 +259,7 @@ lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VA
+ 	 rm -f $@ ; \
+ 	 echo '# Autogenerated by git-gui Makefile' >$@ && \
+ 	 echo >>$@ && \
+-	 $(foreach p,$(PRELOAD_FILES) $(ALL_LIBFILES),echo '$(subst lib/,,$p)' >>$@ &&) \
++	 $(foreach p,$(PRELOAD_FILES) $(sort $(ALL_LIBFILES)),echo '$(subst lib/,,$p)' >>$@ &&) \
+ 	 echo >>$@ ; \
+ 	fi
+ 
diff --git a/git.changes b/git.changes
index b2ec0be..99820ae 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sat Sep  3 19:25:08 UTC 2016 - astieger@suse.com
+
+- git 2.10.0, feature and bugfix update:
+  * various workflow output improvements
+  * various improvements and extensions of command line options
+  * A handful of "git svn" updates.
+  * internal performance improvements
+
+-------------------------------------------------------------------
+Wed Aug 31 15:55:05 UTC 2016 - olaf@aepfle.de
+
+- Reduce build-compare noise 
+  git-asciidoc.patch
+  git-tclIndex.patch
+
 -------------------------------------------------------------------
 Sat Aug 13 08:22:30 UTC 2016 - astieger@suse.com
 
diff --git a/git.spec b/git.spec
index bebb4a2..959cef1 100644
--- a/git.spec
+++ b/git.spec
@@ -26,7 +26,7 @@
 %endif
 
 Name:           git
-Version:        2.9.3
+Version:        2.10.0
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0
@@ -53,6 +53,8 @@ Patch5:         git-bash-completion-egrep-color-fix.diff
 Patch6:         git-tcsh-completion-fixes.diff
 # adapt paths in zsh completion (bnc#853183)
 Patch7:         git-zsh-completion-fixes.diff
+Patch8:         git-asciidoc.patch
+Patch9:         git-tclIndex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  apache2
 BuildRequires:  asciidoc
@@ -244,6 +246,8 @@ directory /git/ that calls the cgi script.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 cat > .make <<'EOF'