From f113746ab8b760fda6e07c6a838f4bfda51d1872aca731b71dc84c627c5ab7d5 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <lnussel+factory@suse.de>
Date: Mon, 19 Dec 2016 10:27:29 +0000
Subject: [PATCH] Accepting request 445373 from devel:tools:scm

1

OBS-URL: https://build.opensuse.org/request/show/445373
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=191
---
 git-gui-tclIndex.patch | 24 ++++++++++++++++++++++++
 git.changes            |  6 ++++++
 git.spec               |  2 ++
 3 files changed, 32 insertions(+)
 create mode 100644 git-gui-tclIndex.patch

diff --git a/git-gui-tclIndex.patch b/git-gui-tclIndex.patch
new file mode 100644
index 0000000..c6f3dff
--- /dev/null
+++ b/git-gui-tclIndex.patch
@@ -0,0 +1,24 @@
+Date: Wed, 16 Nov 2016 16:46:06 -0500 (EST)
+Subject: git-gui: Sort entries in optimized tclIndex
+From: Anders Kaseorg <andersk@mit.edu>
+
+auto_mkindex expands wildcards in directory order, which depends on
+the underlying filesystem.  To improve build reproducibility, sort the
+list of *.tcl files in the Makefile.
+
+The unoptimized loading case (7 lines below) was previously fixed in
+v2.11.0-rc0~31^2^2~14 “git-gui: sort entries in tclIndex”.
+
+Signed-off-by: Anders Kaseorg <andersk@mit.edu>
+
+--- a/git-gui/Makefile
++++ b/git-gui/Makefile
+@@ -252,7 +252,7 @@ $(ALL_MSGFILES): %.msg : %.po
+ lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
+ 	$(QUIET_INDEX)if echo \
+ 	  $(foreach p,$(PRELOAD_FILES),source $p\;) \
+-	  auto_mkindex lib '*.tcl' \
++	  auto_mkindex lib $(patsubst lib/%,%,$(sort $(ALL_LIBFILES))) \
+ 	| $(TCL_PATH) $(QUIET_2DEVNULL); then : ok; \
+ 	else \
+ 	 echo >&2 "    * $(TCL_PATH) failed; using unoptimized loading"; \
diff --git a/git.changes b/git.changes
index 115837e..2ca4dc9 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec  9 17:00:58 UTC 2016 - olaf@aepfle.de
+
+- git-gui: Sort entries in optimized tclIndex
+  git-gui-tclIndex.patch
+
 -------------------------------------------------------------------
 Wed Nov 30 11:54:01 UTC 2016 - astieger@suse.com
 
diff --git a/git.spec b/git.spec
index dd013a4..3a0195b 100644
--- a/git.spec
+++ b/git.spec
@@ -54,6 +54,7 @@ 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-gui-tclIndex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  apache2
 BuildRequires:  asciidoc
@@ -246,6 +247,7 @@ directory /git/ that calls the cgi script.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 cat > .make <<'EOF'