Attachment 633399 Details for Bug 854061 – Proposed patch

[patch] Proposed patch

0001-move-git-prompt.sh-out-of-the-profile.d-and-source-i.patch (text/plain), 2.08 KB, created by Adam Tkac on 2012-10-25 14:55:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Tkac

Created: 2012-10-25 14:55:33 UTC

Size: 2.08 KB

patch

obsolete

>From e40405e9950860885ccb4c3f49def79e6a3c0a9c Mon Sep 17 00:00:00 2001
>From: Adam Tkac <atkac@redhat.com>
>Date: Thu, 25 Oct 2012 16:24:34 +0200
>Subject: [PATCH] move git-prompt.sh out of the profile.d and source it into
> bash completion script (#854061)
>
>Signed-off-by: Adam Tkac <atkac@redhat.com>
>---
> git.spec | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
>diff --git a/git.spec b/git.spec
>index d110a86..97b6a06 100644
>--- a/git.spec
>+++ b/git.spec
>@@ -71,7 +71,7 @@
> 
> Name:           git
> Version:        1.7.12.1
>-Release:        1%{?dist}
>+Release:        2%{?dist}
> Summary:        Fast Version Control System
> License:        GPLv2
> Group:          Development/Tools
>@@ -432,11 +432,9 @@ perl -p \
> %endif
>     %{SOURCE3} > %{buildroot}%{_sysconfdir}/xinetd.d/git
> 
>-# Setup bash completion and git prompt
>+# Setup bash completion
> mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
> install -pm 644 contrib/completion/git-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/git
>-mkdir -p %{buildroot}%{_sysconfdir}/profile.d
>-install -pm 644 contrib/completion/git-prompt.sh %{buildroot}%{_sysconfdir}/profile.d
> 
> # Move contrib/hooks out of %%docdir and make them executable
> mkdir -p %{buildroot}%{_datadir}/git-core/contrib
>@@ -446,6 +444,11 @@ pushd contrib > /dev/null
> ln -s ../../../git-core/contrib/hooks
> popd > /dev/null
> 
>+# Install git_prompt and source it into bash completion
>+install -pm 644 contrib/completion/git-prompt.sh %{buildroot}%{_datadir}/git-core/contrib/git-prompt.sh
>+echo ". %{_datadir}/git-core/contrib/git-prompt.sh" >> \
>+    %{buildroot}%{_sysconfdir}/bash_completion.d/git
>+
> # install git-gui .desktop file
> desktop-file-install \
> %if %{use_desktop_vendor}
>@@ -580,6 +583,10 @@ rm -rf %{buildroot}
> # No files for you!
> 
> %changelog
>+* Thu Oct 25 2012 Adam Tkac <atkac redhat com> - 1.7.12.1-2
>+- move git-prompt.sh out of the profile.d and source it into bash completion
>+  script (#854061)
>+
> * Thu Sep 27 2012 Adam Tkac <atkac redhat com> - 1.7.12.1-1
> - update to 1.7.12.1
> - cvsimport should skip more characters (#850640)
>-- 
>1.7.12.1
>

Actions: View | Diff

Attachments on bug 854061: 633399