Accepting request 442829 from devel:tools:scm

git 2.11.0

OBS-URL: https://build.opensuse.org/request/show/442829
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=190

git-2.10.2.tar.xz

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

git-2.11.0.tar.xz

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

git-setup-i18n-fix.patch

@@ -1,13 +0,0 @@
-Index: git-2.10.0/git-sh-setup.sh
-===================================================================
---- git-2.10.0.orig/git-sh-setup.sh	2016-09-03 03:59:09.000000000 +0200
-+++ git-2.10.0/git-sh-setup.sh	2016-09-07 17:24:58.817642893 +0200
-@@ -3,7 +3,7 @@
- # a few helper shell functions.
- 
- # Source git-sh-i18n for gettext support.
--. git-sh-i18n
-+. "$(git --exec-path)/git-sh-i18n"
- 
- # Having this variable in your environment would break scripts because
- # you would cause "cd" to be taken to unexpected places.  If you

git-tclIndex.patch

@@ -1,19 +0,0 @@
-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,21 @@
+-------------------------------------------------------------------
+Wed Nov 30 11:54:01 UTC 2016 - astieger@suse.com
+
+- git 2.11.0:
+  * backward compatibility:
+    + empty string (matching everything) used as pathspec now
+      triggers a warning
+    + historical argument order "git merge <msg> HEAD <commit>..."
+      is deprecated
+    +  default abbreviation length of 7 now scales by repo size
+  * updates
+    + new version of git-gui
+    + many new command line and configuration options
+    + many workflow and output improvements
+  * dropped upstreamed patches:
+    + git-setup-i18n-fix.patch
+    + git-tclIndex.patch
+
 -------------------------------------------------------------------
 Sat Oct 29 09:00:48 UTC 2016 - astieger@suse.com
 
@@ -25,7 +43,7 @@ Tue Oct  4 11:21:51 UTC 2016 - astieger@suse.com
 -------------------------------------------------------------------
 Wed Sep  7 15:26:55 UTC 2016 - astieger@suse.com
 
-- hotfix shell lib include path in git-sh-setup
+- fix shell lib include path in git-sh-setup (boo#1011169)
   adding git-setup-i18n-fix.patch
 
 -------------------------------------------------------------------

git.spec

@@ -26,7 +26,7 @@
 %endif
 
 Name:           git
-Version:        2.10.2
+Version:        2.11.0
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0
@@ -54,9 +54,6 @@ 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
-# PATCH-FIX-OPENSUSE git-setup-i18n-fix.patch - hotfix shell lib include patch
-Patch10:        git-setup-i18n-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  apache2
 BuildRequires:  asciidoc
@@ -249,8 +246,6 @@ directory /git/ that calls the cgi script.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
-%patch10 -p1
 
 %build
 cat > .make <<'EOF'