[tig] Apply patch from Ville Skyttä; move bash competion

Jason ティビツ tibbs at fedoraproject.org
Thu Feb 19 19:01:00 UTC 2015


commit 9a84671c82da497708ba4c09fa3de8f055834088
Author: Jason Tibbitts <tibbs at math.uh.edu>
Date:   Thu Feb 19 13:00:21 2015 -0600

    Apply patch from Ville Skyttä; move bash competion

 tig.spec | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/tig.spec b/tig.spec
index 96cf802..ed05b4a 100644
--- a/tig.spec
+++ b/tig.spec
@@ -1,6 +1,6 @@
 Name:           tig
 Version:        2.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Text-mode interface for the git revision control system
 
 Group:          Development/Tools
@@ -13,6 +13,7 @@ BuildRequires:  git
 BuildRequires:  ncurses-devel
 BuildRequires:  xmlto
 BuildRequires:  asciidoc
+BuildRequires:  bash-completion
 Requires:       git
 
 %description
@@ -47,8 +48,8 @@ make install install-doc-man DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} \
     mandir=%{_mandir}
 
 # Setup bash completion
-mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
-install -pm 644 contrib/%{name}-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
+bashcompdir=$(pkg-config --variable=completionsdir bash-completion)
+install -Dpm 644 contrib/%{name}-completion.bash %{buildroot}$bashcompdir/%{name}
 
 # Remove test-graph binary
 rm -f $RPM_BUILD_ROOT%{_bindir}/test-graph
@@ -63,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{_bindir}/tig
 
-%{_sysconfdir}/bash_completion.d/%{name}
+%{_datadir}/bash-completion/
 %config(noreplace) %{_sysconfdir}/%{name}rc
 
 %{_mandir}/man1/tig.1*
@@ -72,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Feb 14 2015 Ville Skyttä <ville.skytta at iki.fi> - 2.0.3-2
+- Move bash completion to %%{_datadir}/bash-completion/completions
+
 * Sun Sep 28 2014 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.0.3-1
 - New upstream release
 


More information about the scm-commits mailing list