[rpms/tig] v2.6.1: Some spec cleanups.

[rpms/tig] v2.6.1: Some spec cleanups.

[Jason Tibbitts]

A new commit has been pushed.

Repo   : rpms/tig
Branch : v2.6.1
Commit : 14be347fe6b42e79a0df6e9173f4712a1c9df394
Author : Jason Tibbitts <tibbs@math.uh.edu>
Date   : 2016-08-11T12:39:54-05:00
Stats  : +11/-7 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/tig/c/14be347fe6b42e79a0df6e9173f4712a1c9df394?branch=v2.6.1

Log:
Some spec cleanups.

---
diff --git a/tig.spec b/tig.spec
index b079275..03d01b4 100644
--- a/tig.spec
+++ b/tig.spec
@@ -1,6 +1,6 @@
 Name:           tig
 Version:        2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Text-mode interface for the git revision control system
 
 License:        GPLv2+
@@ -41,18 +41,15 @@ sed -i '/^#!bash/,+1 d' contrib/%{name}-completion.bash
 
 
 %install
-make install install-doc-man DESTDIR=%{buildroot} prefix=%{_prefix} \
-    mandir=%{_mandir}
+%make_install install-doc-man
 
 # Setup bash completion
-bashcompdir=$(pkg-config --variable=completionsdir bash-completion)
+bashcompdir=$(pkg-config --variable=completionsdir bash-completion || echo /etc/bash_completion.d)
 install -Dpm 644 contrib/%{name}-completion.bash %{buildroot}$bashcompdir/%{name}
 
-# Remove test-graph binary
-rm -f %{buildroot}%{_bindir}/test-graph
-
 
 %files
+%license COPYING
 %doc COPYING NEWS.adoc README.adoc *.html
 %{_bindir}/tig
 %{_datadir}/bash-completion/
@@ -63,6 +60,13 @@ rm -f %{buildroot}%{_bindir}/test-graph
 
 
 %changelog
+* 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.
+
 * Thu Aug 11 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.2-1
 - Update to 2.2.
 - Remove needless cruft from spec and be consistent about using %%buildroot.

[rpms/tig] v2.6.1: Some spec cleanups.

[Jason Tibbitts]

A new commit has been pushed.

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

Log:
Some spec cleanups.

---
diff --git a/tig.spec b/tig.spec
index 6cacfa6..a85459d 100644
--- a/tig.spec
+++ b/tig.spec
@@ -3,11 +3,9 @@ Version:        2.2
 Release:        1%{?dist}
 Summary:        Text-mode interface for the git revision control system
 
-Group:          Development/Tools
 License:        GPLv2+
 URL:            http://jonas.nitro.dk/tig
 Source0:        http://jonas.nitro.dk/tig/releases/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  git
 BuildRequires:  ncurses-devel
@@ -28,12 +26,12 @@ Using it as a pager, it will display input from stdin and colorize it.
 
 
 %prep
-%setup -q
+%autosetup
 
 
 %build
 %configure
-make %{?_smp_mflags} all doc-man doc-html
+%make_build all doc-man doc-html
 
 #Convert to unix line endings
 sed -i -e 's/\r//' *.html
@@ -43,8 +41,7 @@ sed -i '/^#!bash/,+1 d' contrib/%{name}-completion.bash
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install install-doc-man DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} \
+make install install-doc-man DESTDIR=%{buildroot} prefix=%{_prefix} \
     mandir=%{_mandir}
 
 # Setup bash completion
@@ -52,20 +49,14 @@ 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
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+rm -f %{buildroot}%{_bindir}/test-graph
 
 
 %files
 %doc COPYING NEWS.adoc README.adoc *.html
-
 %{_bindir}/tig
-
 %{_datadir}/bash-completion/
 %config(noreplace) %{_sysconfdir}/%{name}rc
-
 %{_mandir}/man1/tig.1*
 %{_mandir}/man5/tigrc.5*
 %{_mandir}/man7/tigmanual.7*
@@ -74,6 +65,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Thu Aug 11 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.2-1
 - Update to 2.2.
+- Remove needless cruft from spec and be consistent about using %%buildroot.
 
 * Mon Jan 25 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.1.1-3
 - Remove pointless %%defattr statement.