[rpms/tig] v2.6.1: Play more with bash completion dir.

[rpms/tig] v2.6.1: Play more with bash completion dir.

[Jason Tibbitts]

A new commit has been pushed.

Repo   : rpms/tig
Branch : v2.6.1
Commit : 2e2ecb4914cc35891006f090649f7ca01ad84708
Author : Jason Tibbitts <tibbs@math.uh.edu>
Date   : 2016-08-11T13:49:57-05:00
Stats  : +12/-5 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/tig/c/2e2ecb4914cc35891006f090649f7ca01ad84708?branch=v2.6.1

Log:
Play more with bash completion dir.

---
diff --git a/tig.spec b/tig.spec
index 03d01b4..a155ab8 100644
--- a/tig.spec
+++ b/tig.spec
@@ -1,6 +1,8 @@
+%global bash_completion_dir %(pkg-config --variable=completionsdir bash-completion || echo /etc/bash_completion.d)/
+
 Name:           tig
 Version:        2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Text-mode interface for the git revision control system
 
 License:        GPLv2+
@@ -26,6 +28,7 @@ Using it as a pager, it will display input from stdin and colorize it.
 
 
 %prep
+echo %bash_completion_dir
 %autosetup
 
 
@@ -44,15 +47,15 @@ sed -i '/^#!bash/,+1 d' contrib/%{name}-completion.bash
 %make_install install-doc-man
 
 # Setup bash completion
-bashcompdir=$(pkg-config --variable=completionsdir bash-completion || echo /etc/bash_completion.d)
-install -Dpm 644 contrib/%{name}-completion.bash %{buildroot}$bashcompdir/%{name}
+install -Dpm 644 contrib/%{name}-completion.bash %{buildroot}%{bash_completion_dir}/%{name}
+ls -lR %buildroot
 
 
 %files
 %license COPYING
 %doc COPYING NEWS.adoc README.adoc *.html
 %{_bindir}/tig
-%{_datadir}/bash-completion/
+%{bash_completion_dir}
 %config(noreplace) %{_sysconfdir}/%{name}rc
 %{_mandir}/man1/tig.1*
 %{_mandir}/man5/tigrc.5*
@@ -60,12 +63,16 @@ install -Dpm 644 contrib/%{name}-completion.bash %{buildroot}$bashcompdir/%{name
 
 
 %changelog
+* Thu Aug 11 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.2-3
+- Move the bash completion dir thing into a macro.  I will probably just make
+  this a system-wide macro at some point.
+
 * Thu Aug 11 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.2-2
 - Handle case where pkg-config fails (EL6 and EL5).  Might as well test those
   magic EPEL RPM macros.
 - Use License tag.
 - Remove useless delete of test-graph; hasn't done anything for ages.
-- Use %make_install.
+- Use %%make_install.
 
 * Thu Aug 11 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.2-1
 - Update to 2.2.