From d036f1fd64bd2231a14f6a6cc2aa15cfd8edce662ef4c52ddaa36975dbddd9d3 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Sat, 18 Jun 2022 20:05:18 +0000
Subject: [PATCH] Accepting request 982932 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/982932
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=280
---
 git-tcsh-completion-fixes.diff |  2 +-
 git-zsh-completion-fixes.diff  | 16 ----------------
 git.changes                    |  7 +++++++
 git.spec                       | 12 +++++-------
 4 files changed, 13 insertions(+), 24 deletions(-)
 delete mode 100644 git-zsh-completion-fixes.diff

diff --git a/git-tcsh-completion-fixes.diff b/git-tcsh-completion-fixes.diff
index d773a6b..bd4de25 100644
--- a/git-tcsh-completion-fixes.diff
+++ b/git-tcsh-completion-fixes.diff
@@ -14,7 +14,7 @@ Index: git-2.11.0/contrib/completion/git-completion.tcsh
  
 -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_original_script = /usr/share/bash-completion/completions/git
 +set __git_tcsh_completion_script = $RPM_BUILD_ROOT/usr/share/tcsh/git.complete
  
 -# Check that the user put the script in the right place
diff --git a/git-zsh-completion-fixes.diff b/git-zsh-completion-fixes.diff
deleted file mode 100644
index bd59b44..0000000
--- a/git-zsh-completion-fixes.diff
+++ /dev/null
@@ -1,16 +0,0 @@
----
- contrib/completion/git-completion.zsh |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: git-2.30.0/contrib/completion/git-completion.zsh
-===================================================================
---- git-2.30.0.orig/contrib/completion/git-completion.zsh
-+++ git-2.30.0/contrib/completion/git-completion.zsh
-@@ -36,6 +36,7 @@ if [ -z "$script" ]; then
- 		"$(dirname ${funcsourcetrace[1]%:*})"/git-completion.bash
- 		"$HOME/.local/share/bash-completion/completions/git"
- 		"$bash_completion/git"
-+		'/etc/bash_completion.d/git.sh' # suse
- 		'/etc/bash_completion.d/git' # old debian
- 		)
- 	for e in $locations; do
diff --git a/git.changes b/git.changes
index e6259cb..4a3acd2 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun 15 19:39:55 UTC 2022 - Antoine Belvire <antoine.belvire@opensuse.org>
+
+- Fix rpmlint errors/warnings about bash/zsh completion locations.
+- Remove now obsolete git-zsh-completion-fixes.diff.
+- Adjust git-tcsh-completion-fixes.diff.
+
 -------------------------------------------------------------------
 Tue May 24 11:48:21 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/git.spec b/git.spec
index 20c865f..18ba0ed 100644
--- a/git.spec
+++ b/git.spec
@@ -60,8 +60,6 @@ Patch3:         completion-wordbreaks.diff
 Patch4:         git-prevent_xss-default.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
 Patch8:         git-asciidoc.patch
 Patch10:        setup-don-t-fail-if-commondir-reference-is-deleted.patch
 BuildRequires:  fdupes
@@ -402,8 +400,8 @@ find %{buildroot}/%{_datadir}/git-core/templates -type f -name "*.sample" -exec
 %if %{with docs}
 find %{buildroot}/%{_mandir} -type f -exec chmod 644 "{}" "+"
 %endif
-install -m 644 -D contrib/completion/git-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/git.sh
-install -m 644 -D contrib/completion/git-prompt.sh %{buildroot}%{_sysconfdir}/bash_completion.d/git-prompt.sh
+install -m 644 -D contrib/completion/git-completion.bash %{buildroot}%{_datadir}/bash-completion/completions/git
+install -m 644 -D contrib/completion/git-prompt.sh %{buildroot}%{_datadir}/bash-completion/completions/git-prompt.sh
 # contrib/credential
 %if %{with git_gnome_keyring}
 install -m 755 -D contrib/credential/gnome-keyring/git-credential-gnome-keyring %{buildroot}/%{gitexecdir}/git-credential-gnome-keyring
@@ -420,7 +418,7 @@ install -m 755 -D contrib/workdir/git-new-workdir %{buildroot}/%{_bindir}
  install -m 644 -D git.csh %{buildroot}%{_sysconfdir}/profile.d/git.csh
 )
 # zsh completion
-install -m 644 -D contrib/completion/git-completion.zsh %{buildroot}%{_sysconfdir}/zsh_completion.d/_git
+install -m 644 -D contrib/completion/git-completion.zsh %{buildroot}%{_datadir}/zsh/site-functions/_git
 #
 # apparmor profile for git-web
 #
@@ -573,10 +571,10 @@ fi
 # We want to prefer the builtin
 %exclude %{gitexecdir}/git-add--interactive
 %{_bindir}/git-new-workdir
-%{_sysconfdir}/bash_completion.d/*.sh
+%{_datadir}/bash-completion/completions/*
 %{_datadir}/tcsh
+%{_datadir}/zsh/site-functions/_git
 %{_sysconfdir}/profile.d/*.csh
-%{_sysconfdir}/zsh_completion.d
 
 %files -n perl-Git
 %license COPYING