diff --git a/git-2.10.0.tar.sign b/git-2.10.0.tar.sign new file mode 100644 index 0000000..d78cc97 Binary files /dev/null and b/git-2.10.0.tar.sign differ 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 9418964..0000000 Binary files a/git-2.9.3.tar.sign and /dev/null differ 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=~ + apostrophe=' + backtick=` + litdd=-- ++# 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'