[rtorrent] - Fix bad usage of ncurses

[konradm]

commit 5ce70d76e22d2b05030eba5ce9aff40a0b9f93a7
Author: Conrad Meyer <cemeyer at cs.washington.edu>
Date:   Sat Mar 5 16:08:48 2011 -0800

    - Fix bad usage of ncurses

 ...nt-0.8.7-canvas-patch-fix-for-ncurses-5-8.patch |   10 ++++++++++
 rtorrent.spec                                      |    9 ++++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/rtorrent-0.8.7-canvas-patch-fix-for-ncurses-5-8.patch b/rtorrent-0.8.7-canvas-patch-fix-for-ncurses-5-8.patch
new file mode 100644
index 0000000..b9a09d4
--- /dev/null
+++ b/rtorrent-0.8.7-canvas-patch-fix-for-ncurses-5-8.patch
@@ -0,0 +1,10 @@
+--- rtorrent-0.8.7/src/display/canvas.h	2011-03-01 14:56:25.000000000 +0800
++++ rtorrent-0.8.7/src/display/canvas.h	2011-03-01 14:56:10.000000000 +0800
+@@ -48,7 +48,7 @@ class Canvas {
+ public:
+   typedef std::vector<Attributes> attributes_list;
+ 
+-  Canvas(int x = 0, int y = 0, int width = 0, int height = 0) :
++  Canvas(int x = 0, int y = 0, int width = 1, int height = 1) :
+     m_window(newwin(height, width, y, x)) {}
+   ~Canvas() { delwin(m_window); }
diff --git a/rtorrent.spec b/rtorrent.spec
index c4e5880..47fb59f 100644
--- a/rtorrent.spec
+++ b/rtorrent.spec
@@ -3,7 +3,7 @@ Name:          rtorrent
 License:       GPLv2+ with exceptions
 Group:         Applications/Internet
 Version:       0.8.7
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/rtorrent-%{version}.tar.gz
@@ -13,6 +13,8 @@ Patch0:        rtorrent-0.8.6-fallocate.patch
 Patch1:        rtorrent.libxmlrpcFTBFS.patch
 # Add OPTIONAL noverify SSL support (rhbz #669251)
 Patch2:        rtorrent-0.8.7-optional-https-noverify.patch
+# Patch to make ncurses work on F15+ (#682454)
+Patch3:        rtorrent-0.8.7-canvas-patch-fix-for-ncurses-5-8.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: curl-devel
@@ -38,6 +40,8 @@ of directories for torrent files to seed and/or download.
 %patch1 -p1 -b .ftbfs
 # http://libtorrent.rakshasa.no/ticket/1402
 %patch2 -p1 -b .https_noverify
+# http://libtorrent.rakshasa.no/ticket/2518
+%patch3 -p1 -b .ncurses
 
 %build
 %configure --with-xmlrpc-c
@@ -60,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/rtorrent*
 
 %changelog
+* Sat Mar 5 2011 Conrad Meyer <konrad at tylerc.org> - 0.8.7-6
+- Fix bad usage of ncurses
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild