tibbs pushed to tig (f21). "Merge branch 'master' into f21 (..more)"

Tue Apr 14 22:43:03 UTC 2015

>From 294f23198c282f6c0a760524d6df751a625c00f8 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan at x-tnd.be>
Date: Sun, 28 Sep 2014 09:20:17 +0200
Subject: New upstream release

diff --git a/sources b/sources
index 36e3d26..d7d20e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e10e925d73d32ff7e17352b79dbc16f9  tig-2.0.2.tar.gz
+cd78dacf91798b5e48269813d678ebd7  tig-2.0.3.tar.gz
diff --git a/tig.spec b/tig.spec
index fceb33b..96cf802 100644
--- a/tig.spec
+++ b/tig.spec
@@ -1,6 +1,6 @@
 Name:           tig
-Version:        2.0.2
-Release:        3%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        Text-mode interface for the git revision control system
 
 Group:          Development/Tools
@@ -72,13 +72,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 28 2014 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.0.3-1
+- New upstream release
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-* Sat May 10 2014 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.0.2
+* Sat May 10 2014 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.0.2-1
 - New upstream release
 
 * Mon Aug 26 2013 Johan Cwiklinski <johan AT x-tnd DOT be> - 1.2.1-1
-- 
cgit v0.10.2


>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


>From 9b0c0617ec557a5c2b59c6fa744199c346610632 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs at math.uh.edu>
Date: Thu, 12 Mar 2015 21:10:08 -0500
Subject: Update to 2.1.


diff --git a/sources b/sources
index d7d20e4..1f2805c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd78dacf91798b5e48269813d678ebd7  tig-2.0.3.tar.gz
+d6c237aba2c03d85897da79789fd6104  tig-2.1.tar.gz
diff --git a/tig.spec b/tig.spec
index ed05b4a..711f593 100644
--- a/tig.spec
+++ b/tig.spec
@@ -1,6 +1,6 @@
 Name:           tig
-Version:        2.0.3
-Release:        2%{?dist}
+Version:        2.1
+Release:        1%{?dist}
 Summary:        Text-mode interface for the git revision control system
 
 Group:          Development/Tools
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Mar 12 2015 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.1-1
+- Update to 2.1.
+
 * Sat Feb 14 2015 Ville Skyttä <ville.skytta at iki.fi> - 2.0.3-2
 - Move bash completion to %%{_datadir}/bash-completion/completions
 
-- 
cgit v0.10.2


>From acd419e488f70f04e0f703d4aefeafbf6b275d04 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs at math.uh.edu>
Date: Tue, 14 Apr 2015 17:40:36 -0500
Subject: Update to 2.1.1.


diff --git a/sources b/sources
index 1f2805c..dc6dbbc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d6c237aba2c03d85897da79789fd6104  tig-2.1.tar.gz
+d6eb13d31319d57a3f726d8238f8ebc0  tig-2.1.1.tar.gz
diff --git a/tig.spec b/tig.spec
index 711f593..60f5f79 100644
--- a/tig.spec
+++ b/tig.spec
@@ -1,5 +1,5 @@
 Name:           tig
-Version:        2.1
+Version:        2.1.1
 Release:        1%{?dist}
 Summary:        Text-mode interface for the git revision control system
 
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 14 2015 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.1.1-1
+- Update to 2.1.1.
+
 * Thu Mar 12 2015 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.1-1
 - Update to 2.1.
 
-- 
cgit v0.10.2


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