Accepting request 427802 from devel:tools:scm

- hotfix shell lib include path in git-sh-setup
  adding git-setup-i18n-fix.patch

OBS-URL: https://build.opensuse.org/request/show/427802
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=187
This commit is contained in:
Dominique Leuenberger 2016-09-17 12:38:36 +00:00 committed by Git OBS Bridge
parent d324862e99
commit eb2416479e
3 changed files with 22 additions and 0 deletions

13
git-setup-i18n-fix.patch Normal file
View File

@ -0,0 +1,13 @@
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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 7 15:26:55 UTC 2016 - astieger@suse.com
- hotfix shell lib include path in git-sh-setup
adding git-setup-i18n-fix.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Sep 3 19:25:08 UTC 2016 - astieger@suse.com Sat Sep 3 19:25:08 UTC 2016 - astieger@suse.com

View File

@ -55,6 +55,8 @@ Patch6: git-tcsh-completion-fixes.diff
Patch7: git-zsh-completion-fixes.diff Patch7: git-zsh-completion-fixes.diff
Patch8: git-asciidoc.patch Patch8: git-asciidoc.patch
Patch9: git-tclIndex.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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: apache2 BuildRequires: apache2
BuildRequires: asciidoc BuildRequires: asciidoc
@ -248,6 +250,7 @@ directory /git/ that calls the cgi script.
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1
%build %build
cat > .make <<'EOF' cat > .make <<'EOF'