Accepting request 133877 from devel:tools:scm

Fix regression in 1.7.12 package (__git_ps1 disappeared) (forwarded request 133838 from flichtenheld)

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

git-1.7.11.5.tar.gz

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

git-1.7.12.tar.gz

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

git-bash-completion-egrep-color-fix.diff

@@ -0,0 +1,15 @@
+---
+ contrib/completion/git-completion.bash |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/contrib/completion/git-completion.bash
++++ b/contrib/completion/git-completion.bash
+@@ -815,7 +815,7 @@ __git_complete_strategy ()
+ __git_list_all_commands ()
+ {
+ 	local i IFS=" "$'\n'
+-	for i in $(git help -a|egrep '^  [a-zA-Z0-9]')
++	for i in $(git help -a|egrep --color=never '^  [a-zA-Z0-9]')
+ 	do
+ 		case $i in
+ 		*--*)             : helper pattern;;

git.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Sep 12 14:43:30 UTC 2012 - frank.lichtenheld@sophos.com
+
+- git-prompt.sh (for __git_ps1) was broken out of
+  git-completion.bash. Install it too.
+
+-------------------------------------------------------------------
+Tue Sep 11 14:53:25 CEST 2012 - tiwai@suse.de
+
+- updated to version 1.7.12:
+  Major version update; new XDG-compliant config file place, 
+  new options, new commands:
+  See Documentation/RelNotes/1.7.12.txt for details.
+  
+- fix broken bash completion when egrep is aliased with --color
+  option (bnc#779536)
+
 -------------------------------------------------------------------
 Thu Aug 16 11:57:53 CEST 2012 - tiwai@suse.de
 

git.spec

@@ -30,7 +30,7 @@ BuildRequires:  perl-Error
 BuildRequires:  python
 BuildRequires:  sgml-skel
 BuildRequires:  xmlto
-Version:        1.7.11.5
+Version:        1.7.12
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0
@@ -47,6 +47,8 @@ Patch2:         git-python-install-fix.diff
 Patch3:         completion-wordbreaks.diff
 # CVE-2011-2186, bnc#698456
 Patch4:         git-prevent_xss-default.diff
+# fix broken bash copmletion with colored egrep (bnc#779536)
+Patch5:         git-bash-completion-egrep-color-fix.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       git-core = %{version}
 Recommends:     git-svn git-cvs git-email gitk git-gui git-web
@@ -189,6 +191,7 @@ This package contains the building blocks for remote helpers written in Python.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 cat > .make <<'EOF'
@@ -243,6 +246,7 @@ rm -rf %{buildroot}/usr/lib/perl5/site_perl
 %perl_process_packlist
 find $RPM_BUILD_ROOT/%_mandir -type f -print0 | xargs -0 chmod 644
 install -m 644 -D contrib/completion/git-completion.bash $RPM_BUILD_ROOT/etc/bash_completion.d/git.sh
+install -m 644 -D contrib/completion/git-prompt.sh $RPM_BUILD_ROOT/etc/bash_completion.d/git-prompt.sh
 #
 # apparmor profile for git-web
 #
@@ -373,6 +377,6 @@ fi
 %{perl_vendorlib}/Git/
 %{perl_vendorlib}/Git/*.pm
 %{perl_vendorarch}/auto/Git/
-/etc/bash_completion.d/git.sh
+/etc/bash_completion.d/*.sh
 
 %changelog