[rpms/tig] v2.6.1: Merge branch 'master' of ssh://pkgs.fedoraproject.org/tig

[rpms/tig] v2.6.1: Merge branch 'master' of ssh://pkgs.fedoraproject.org/tig

[Jason Tibbitts]

A new commit has been pushed.

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

Log:
Merge branch 'master' of ssh://pkgs.fedoraproject.org/tig

---
diff --git a/tig.spec b/tig.spec
index a85459d..b079275 100644
--- a/tig.spec
+++ b/tig.spec
@@ -66,6 +66,8 @@ rm -f %{buildroot}%{_bindir}/test-graph
 * 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.
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
 * Mon Jan 25 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.1.1-3
 - Remove pointless %%defattr statement.

diff --git a/sources b/sources
index dc6dbbc..323d2c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d6eb13d31319d57a3f726d8238f8ebc0  tig-2.1.1.tar.gz
+11c1c3c54a8c9883b14a35ba1dad0b87  tig-2.2.tar.gz

diff --git a/tig.spec b/tig.spec
index e55aba3..b079275 100644
--- a/tig.spec
+++ b/tig.spec
@@ -1,13 +1,11 @@
 Name:           tig
-Version:        2.1.1
-Release:        4%{?dist}
+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,26 +49,23 @@ 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*
 
 
 %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.
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild