[irssi/f17: 2/2] Merge of f16 branch

[Jaroslav Škarvada]

commit c4d061e4627b519f28fa1ce1d53b4a2cfaad74aa
Merge: 4e35459 ac1ea16
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Fri Feb 24 11:38:25 2012 +0100

    Merge of f16 branch

 irssi-0.8.15-init-resize-crash-fix.patch |   13 +++++++++++++
 irssi.spec                               |   10 +++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --cc irssi.spec
index 799ad57,d3dd719..69f9ed1
--- a/irssi.spec
+++ b/irssi.spec
@@@ -3,7 -3,7 +3,7 @@@
  Summary:	Modular text mode IRC client with Perl scripting
  Name:		irssi
  Version:	0.8.15
--Release:	7%{?dist}
++Release:	8%{?dist}
  
  License:	GPLv2+
  Group:		Applications/Communications
@@@ -84,9 -87,11 +87,14 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 -* Fri Feb 24 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 0.8.15-7
++* Fri Feb 24 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 0.8.15-8
+ - Fixed crash that can occur if term is resized during irssi init
+   (init-resize-crash-fix patch)
+   Resolves: rhbz#796457
+ 
 +* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.15-7
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
  * Mon Jun 20 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.8.15-6
  - Perl mass rebuild