[tmux/el6: 4/5] Merge in 1.6 for el6 upgrade

[Steven Roberts]

commit 37fa7e3adac297f22ad5e452fe5f9ab62a20d39e
Merge: eb1d409 56af6fa
Author: Steven Roberts <strobert at strobe.net>
Date:   Fri Aug 9 20:05:57 2013 -0700

    Merge in 1.6 for el6 upgrade

 .gitignore |    1 +
 sources    |    2 +-
 tmux.spec  |   16 ++++++++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index e69de29,62b8226..d4775e5
--- a/.gitignore
+++ b/.gitignore
@@@ -1,0 -1,4 +1,1 @@@
 -tmux-1.3.tar.gz
 -/tmux-1.4.tar.gz
 -/tmux-1.5.tar.gz
+ /tmux-1.6.tar.gz
diff --cc tmux.spec
index d051824,0a81b96..477bccc
--- a/tmux.spec
+++ b/tmux.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           tmux
- Version:        1.5
- Release:        1%{?dist}
+ Version:        1.6
 -Release:        2%{?dist}
++Release:        3%{?dist}
  Summary:        A terminal multiplexer
  
  Group:          Applications/System
@@@ -48,6 -48,15 +48,18 @@@ f
  %{_mandir}/man1/tmux.1.*
  
  %changelog
++* Fri Aug 09 2013 Steven Roberts <strobert at strobe.net> - 1.6-3
++- Building for el6
++
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
+ * Tue Jan 31 2012 Sven Lankes <sven at lank.es> 1.6-1
+ - New upstream release
+ 
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Tue Nov 01 2011 Sven Lankes <sven at lank.es> 1.5-1
  - New upstream release
  - Do the right thing (tm) and revert to $upstream-behaviour: