Accepting request 245535 from devel:tools:scm

1

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

0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch

@@ -1,44 +0,0 @@
-From a906459c2a89938e911f1650e6ce22315a1ec84d Mon Sep 17 00:00:00 2001
-From: Todd Zullinger <tmz@pobox.com>
-Date: Fri, 4 Jan 2013 11:54:21 -0500
-Subject: [PATCH] git-subtree: Use gitexecdir instead of libexecdir
-
-When the git subtree Makefile includes config.mak from the toplevel,
-it's useful to have the same variables set globally applied.  Using
-gitexecdir instead of libexecdir respects the global settings more
-consistently.
-
-Remove the unused gitdir variable as well.
----
- contrib/subtree/Makefile | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
-index 435b2de..dc8da19 100644
---- a/contrib/subtree/Makefile
-+++ b/contrib/subtree/Makefile
-@@ -2,9 +2,8 @@
- -include ../../config.mak
- 
- prefix ?= /usr/local
-+gitexecdir ?= $(prefix)/libexec/git-core
- mandir ?= $(prefix)/share/man
--libexecdir ?= $(prefix)/libexec/git-core
--gitdir ?= $(shell git --exec-path)
- man1dir ?= $(mandir)/man1
- 
- gitver ?= $(word 3,$(shell git --version))
-@@ -30,8 +29,8 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH)
- doc: $(GIT_SUBTREE_DOC) $(GIT_SUBTREE_HTML)
- 
- install: $(GIT_SUBTREE)
--	$(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir)
--	$(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(libexecdir)
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir)
-+	$(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(gitexecdir)
- 
- install-doc: install-man
- 
--- 
-1.8.3.1
-

completion-wordbreaks.diff

@@ -2,12 +2,14 @@
  contrib/completion/git-completion.bash |   10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
---- a/contrib/completion/git-completion.bash
-+++ b/contrib/completion/git-completion.bash
-@@ -23,10 +23,12 @@
- #    3) Consider changing your PS1 to also show the current branch,
- #       see git-prompt.sh for details.
-
+Index: git-2.1.0/contrib/completion/git-completion.bash
+===================================================================
+--- git-2.1.0.orig/contrib/completion/git-completion.bash	2014-08-15 23:26:55.000000000 +0100
++++ git-2.1.0/contrib/completion/git-completion.bash	2014-08-17 21:49:40.000000000 +0100
+@@ -28,10 +28,12 @@
+ # tell the completion to use commit completion.  This also works with aliases
+ # of form "!sh -c '...'".  For example, "!sh -c ': git commit ; ... '".
+ 
 -case "$COMP_WORDBREAKS" in
 -*:*) : great ;;
 -*)   COMP_WORDBREAKS="$COMP_WORDBREAKS:"
@@ -18,6 +20,6 @@
 +#*:*) : great ;;
 +#*)   COMP_WORDBREAKS="$COMP_WORDBREAKS:"
 +#esac
-
+ 
  # __gitdir accepts 0 or 1 arguments (i.e., location)
  # returns location of .git repo

git-2.0.4.tar.xz

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

git-2.1.0.tar.xz

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

git.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sun Aug 17 20:51:52 UTC 2014 - andreas.stieger@gmx.de
+
+- git 2.1.0
+- incompatible changes:
+  * default pager configuration no longer wraps long lines. To
+    restore:
+    $ git config core.pager "less -S"
+    $ git config pager.blame "less -S"
+- Changes to specific UI, configuration, workflow and features
+- Bug fixes and internal improvements
+- Full list:
+  https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.1.0.txt
+- remove pathc, upstream:
+  0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch
+
 -------------------------------------------------------------------
 Thu Jul 31 16:01:38 UTC 2014 - andreas.stieger@gmx.de
 

git.spec

@@ -20,7 +20,7 @@
 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
 
 Name:           git
-Version:        2.0.4
+Version:        2.1.0
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0
@@ -43,7 +43,6 @@ 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:         0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  apache2
 BuildRequires:  asciidoc
@@ -211,7 +210,6 @@ directory /git/ that calls the cgi script.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 %build
 cat > .make <<'EOF'