tibbs pushed to tig (f21). "Apply patch from Ville Skyttä; move bash competion"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Apr 14 22:42:47 UTC 2015


>From 9a84671c82da497708ba4c09fa3de8f055834088 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs at math.uh.edu>
Date: Thu, 19 Feb 2015 13:00:21 -0600
Subject: =?UTF-8?q?Apply=20patch=20from=20Ville=20Skytt=C3=A4;=20move=20ba?=
 =?UTF-8?q?sh=20competion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit


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
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/tig.git/commit/?h=f21&id=9a84671c82da497708ba4c09fa3de8f055834088


More information about the scm-commits mailing list