Accepting request 209245 from devel:tools:scm

- Add missing obsoletes for git-remote-helpers subpackage, which
  was dropped in git 1.8.5 (forwarded request 209244 from tiwai)

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

git-1.8.4.4.tar.gz

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

git-1.8.5.tar.gz

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

git-python-install-fix.diff

@@ -1,26 +0,0 @@
-Index: git-1.8.4/Makefile
-===================================================================
---- git-1.8.4/Makefile.orig	2013-08-24 03:38:43.000000000 +0800
-+++ git-1.8.4/Makefile	2013-08-26 09:46:14.596687535 +0800
-@@ -1838,7 +1838,7 @@ $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PRE
- $(SCRIPT_PYTHON_GEN): % : %.py
- 	$(QUIET_GEN)$(RM) $@ $@+ && \
- 	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \
--		--no-print-directory prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' \
-+		--no-print-directory prefix='$(prefix_SQ)' DESTDIR= \
- 		instlibdir` && \
- 	sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
- 	    -e 's|\(os\.getenv("GITPYTHONLIB"\)[^)]*)|\1,"@@INSTLIBDIR@@")|' \
-Index: git-1.8.4/git_remote_helpers/Makefile
-===================================================================
---- git-1.8.4/git_remote_helpers/Makefile.orig	2013-08-24 03:38:43.000000000 +0800
-+++ git-1.8.4/git_remote_helpers/Makefile	2013-08-26 09:47:37.941682649 +0800
-@@ -35,7 +35,7 @@ all: $(pysetupfile)
- 	$(QUIET)echo "$(py_version)" >GIT-PYTHON-VERSION
- 
- install: $(pysetupfile)
--	$(PYTHON_PATH) $(pysetupfile) install --prefix $(DESTDIR_SQ)$(prefix)
-+	$(PYTHON_PATH) $(pysetupfile) install --prefix $(prefix) --root $(DESTDIR_SQ)
- 
- instlibdir: $(pysetupfile)
- 	@echo "$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR)"

git-tcsh-completion-fixes.diff

@@ -0,0 +1,42 @@
+---
+ contrib/completion/git-completion.tcsh |    7 ++-----
+ contrib/completion/git.csh             |    5 +++++
+ contrib/completion/git.tcsh            |    5 +++++
+ 3 files changed, 12 insertions(+), 5 deletions(-)
+
+--- a/contrib/completion/git-completion.tcsh
++++ b/contrib/completion/git-completion.tcsh
+@@ -34,8 +34,8 @@ if ( ${__git_tcsh_completion_version[1]}
+ endif
+ unset __git_tcsh_completion_version
+ 
+-set __git_tcsh_completion_original_script = ${HOME}/.git-completion.bash
+-set __git_tcsh_completion_script = ${HOME}/.git-completion.tcsh.bash
++set __git_tcsh_completion_original_script = /etc/bash_completion.d/git.sh
++set __git_tcsh_completion_script = $RPM_BUILD_ROOT/usr/share/tcsh/git.complete
+ 
+ # Check that the user put the script in the right place
+ if ( ! -e ${__git_tcsh_completion_original_script} ) then
+@@ -123,6 +123,3 @@ EOF
+ 
+ # Don't need this variable anymore, so don't pollute the users environment
+ unset __git_tcsh_completion_original_script
+-
+-complete git  'p,*,`bash ${__git_tcsh_completion_script} git "${COMMAND_LINE}"`,'
+-complete gitk 'p,*,`bash ${__git_tcsh_completion_script} gitk "${COMMAND_LINE}"`,'
+--- /dev/null
++++ b/contrib/completion/git.csh
+@@ -0,0 +1,5 @@
++if (! ${?prompt}) goto end
++complete git  'p,*,`bash /usr/share/tcsh/git.complete git "${COMMAND_LINE}"`,'
++complete gitk 'p,*,`bash /usr/share/tcsh/git.complete gitk "${COMMAND_LINE}"`,'
++done:
++
+--- /dev/null
++++ b/contrib/completion/git.tcsh
+@@ -0,0 +1,5 @@
++if (! ${?prompt} || ! ${?tcsh}) goto end
++complete git  'p,*,`bash /usr/share/tcsh/git.complete git "${COMMAND_LINE}"`,'
++complete gitk 'p,*,`bash /usr/share/tcsh/git.complete gitk "${COMMAND_LINE}"`,'
++end:
++

git-zsh-completion-fixes.diff

@@ -0,0 +1,14 @@
+---
+ contrib/completion/git-completion.zsh |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/contrib/completion/git-completion.zsh
++++ b/contrib/completion/git-completion.zsh
+@@ -30,6 +30,7 @@ if [ -z "$script" ]; then
+ 	local -a locations
+ 	local e
+ 	locations=(
++		'/etc/bash_completion.d/git.sh' # suse
+ 		'/etc/bash_completion.d/git' # fedora, old debian
+ 		'/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian
+ 		'/usr/share/bash-completion/git' # gentoo

git.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Dec  3 11:26:19 CET 2013 - tiwai@suse.de
+
+- Add missing obsoletes for git-remote-helpers subpackage, which
+  was dropped in git 1.8.5
+
+-------------------------------------------------------------------
+Mon Dec  2 17:38:45 CET 2013 - tiwai@suse.de
+
+- git-tcsh-completion-fixes.diff:
+  git-zsh-completion-fixes.diff:
+  install tcsh and zsh completion files (bnc#853183)
+
+-------------------------------------------------------------------
+Mon Dec  2 01:56:36 UTC 2013 - douglarek@outlook.com
+
+- updated to version 1.8.5
+
+  * remove git-python-install-fix.diff, no longer to use it.
+
+  https://raw.github.com/git/git/master/Documentation/RelNotes/1.8.5.txt
+
 -------------------------------------------------------------------
 Wed Nov 27 02:07:30 UTC 2013 - douglarek@outlook.com
 

git.spec

@@ -20,7 +20,7 @@
 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
 
 Name:           git
-Version:        1.8.4.4
+Version:        1.8.5
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0
@@ -34,12 +34,15 @@ Source3:        git-daemon.init
 Source4:        git.xinetd
 Source5:        usr.share.git-web.gitweb.cgi
 Source6:        susefirewall-git-daemon
-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
+# cook up tcsh completion to be installable (bnc#853183)
+Patch6:         git-tcsh-completion-fixes.diff
+# adapt paths in zsh completion (bnc#853183)
+Patch7:         git-zsh-completion-fixes.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  apache2
 BuildRequires:  asciidoc
@@ -52,6 +55,7 @@ BuildRequires:  pcre-devel
 BuildRequires:  perl-Error
 BuildRequires:  python
 BuildRequires:  sgml-skel
+BuildRequires:  tcsh
 BuildRequires:  xmlto
 Requires:       git-core = %{version}
 Recommends:     git-svn git-cvs git-email gitk git-gui git-web
@@ -76,6 +80,7 @@ Requires:       openssh
 Requires:       perl-Error
 Requires:       perl-base = %{perl_version}
 Requires:       rsync
+Obsoletes:      git-remote-helpers < %{version}
 
 %description core
 Git is a fast, scalable, distributed revision control system with an
@@ -182,21 +187,13 @@ CGI script that allows browsing git repositories via web interface.
 The apache2 configuration contained in this package installs a virtual
 directory /git/ that calls the cgi script.
 
-%package remote-helpers
-Summary:        Python package for remote helper scripts
-Group:          Development/Tools/Version Control
-Requires:       git-core = %{version}
-Requires:       python
-
-%description remote-helpers
-This package contains the building blocks for remote helpers written in Python.
-
 %prep
 %setup -q
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 cat > .make <<'EOF'
@@ -253,6 +250,14 @@ rm -rf %{buildroot}/usr/lib/perl5/site_perl
 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
+# process tcsh completion
+(cd contrib/completion
+ mkdir -p $RPM_BUILD_ROOT/usr/share/tcsh
+ tcsh ./git-completion.tcsh
+ install -m 644 -D git.csh $RPM_BUILD_ROOT/etc/profile.d/git.csh
+)
+# zsh completion
+install -m 644 -D contrib/completion/git-completion.zsh $RPM_BUILD_ROOT/etc/zsh_completion.d/_git
 #
 # apparmor profile for git-web
 #
@@ -360,14 +365,6 @@ fi
 /usr/share/gitweb
 /etc/apparmor.d
 
-%files remote-helpers
-%defattr(-,root,root)
-%if %suse_version >= 1120
-%python_sitelib/*
-%else
-%py_sitedir/*
-%endif
-
 %files core -f bin-man-doc-files
 %defattr(-,root,root)
 %{_datadir}/git-core/
@@ -382,5 +379,8 @@ fi
 %{perl_vendorlib}/Git/
 %{perl_vendorarch}/auto/Git/
 /etc/bash_completion.d/*.sh
+/usr/share/tcsh
+/etc/profile.d/*.csh
+/etc/zsh_completion.d
 
 %changelog