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.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c73364ac00ae85ffc6cfb12ca2700bb0edf30f63262be97be4039be594ff29e7
+size 4096264

git-2.9.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f1473350c1792310b51af03a9cb5cce841f68202f835b20d46312a30232fa63
-size 4025288

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=~
+ apostrophe='
+ backtick=`
+ litdd=--
++# drops the "last-updated" footer, with asciidoc-8.6.9+
++footer-style=none
+ 
+ ifdef::backend-docbook[]
+ [linkgit-inlinemacro]

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
+ 

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
 

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'