packages: rtorrent/rtorrent-colors.patch, rtorrent/rtorrent.spec - up to 0.8.9

[arekm]

Author: arekm                        Date: Sat Jun 25 13:22:04 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.8.9

---- Files affected:
packages/rtorrent:
   rtorrent-colors.patch (1.23 -> 1.24) , rtorrent.spec (1.95 -> 1.96) 

---- Diffs:

================================================================
Index: packages/rtorrent/rtorrent-colors.patch
diff -u packages/rtorrent/rtorrent-colors.patch:1.23 packages/rtorrent/rtorrent-colors.patch:1.24
--- packages/rtorrent/rtorrent-colors.patch:1.23	Wed May 11 15:29:02 2011
+++ packages/rtorrent/rtorrent-colors.patch	Sat Jun 25 15:21:59 2011
@@ -73,7 +73,7 @@
 +    core::Download* d = *range.first;
 +
 +    if (d->download()->bytes_done())
-+      ratio = (double)d->download()->up_rate()->total() / (double)d->download()->bytes_done();
++      ratio = (double)d->info()->up_rate()->total() / (double)d->download()->bytes_done();
 +    if (ratio >= 1.0)
 +      col = 1;
 +    else if (ratio >= 0.5)
@@ -83,7 +83,7 @@
 +
 +    position = print_download_title(buffer, last, *range.first, ratio);
 +    m_canvas->print(0, pos, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-+    if (d->download()->is_open())
++    if (d->info()->is_open())
 +      m_canvas->set_attr(0, pos, m_canvas->get_screen_width(), (d->is_done())?0:A_BOLD,
 +        (d->is_done())?col:4);
 +    pos++;
@@ -94,14 +94,14 @@
      position = print_download_info(buffer, last, *range.first);
 -    m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
 +    m_canvas->print(0, pos, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-+    if (!d->download()->is_active())
++    if (!d->info()->is_active())
 +      m_canvas->set_attr(0, pos, m_canvas->get_screen_width(), A_BOLD, 8);
 +    pos++;
  
      position = print_download_status(buffer, last, *range.first);
 -    m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
 +    m_canvas->print(0, pos, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-+    if (!d->download()->is_active())
++    if (!d->info()->is_active())
 +      m_canvas->set_attr(0, pos, m_canvas->get_screen_width(), A_BOLD, 8);
 +    pos++;
  
@@ -125,9 +125,9 @@
  
  char*
 -print_download_title(char* first, char* last, core::Download* d) {
--  return print_buffer(first, last, " %s", d->download()->name().c_str());
+-  return print_buffer(first, last, " %s", d->info()->name().c_str());
 +print_download_title(char* first, char* last, core::Download* d, double ratio) {
-+  return print_buffer(first, last, " %-82s  R: %5.2f", d->download()->name().c_str(), ratio);
++  return print_buffer(first, last, " %-82s  R: %5.2f", d->info()->name().c_str(), ratio);
  }
  
  char*
@@ -137,10 +137,10 @@
  
 -  first = print_buffer(first, last, " [%c%c R: %4.2f",
 +  first = print_buffer(first, last, " [%c%c",
-                        rpc::call_command_string("d.get_tied_to_file", rpc::make_target(d)).empty() ? ' ' : 'T',
--                       rpc::call_command_value("d.get_ignore_commands", rpc::make_target(d)) == 0 ? ' ' : 'I',
--                       (double)rpc::call_command_value("d.get_ratio", rpc::make_target(d)) / 1000.0);
-+                       rpc::call_command_value("d.get_ignore_commands", rpc::make_target(d)) == 0 ? ' ' : 'I');
+                        rpc::call_command_string("d.tied_to_file", rpc::make_target(d)).empty() ? ' ' : 'T',
+-                       rpc::call_command_value("d.ignore_commands", rpc::make_target(d)) == 0 ? ' ' : 'I',
+-                       (double)rpc::call_command_value("d.ratio", rpc::make_target(d)) / 1000.0);
++                       rpc::call_command_value("d.ignore_commands", rpc::make_target(d)) == 0 ? ' ' : 'I');
  
    if (d->priority() != 2)
      first = print_buffer(first, last, " %s]", rpc::call_command_string("d.get_priority_str", rpc::make_target(d)).c_str());

================================================================
Index: packages/rtorrent/rtorrent.spec
diff -u packages/rtorrent/rtorrent.spec:1.95 packages/rtorrent/rtorrent.spec:1.96
--- packages/rtorrent/rtorrent.spec:1.95	Wed May 11 15:52:03 2011
+++ packages/rtorrent/rtorrent.spec	Sat Jun 25 15:21:59 2011
@@ -11,18 +11,17 @@
 Summary:	rTorrent - a console-based BitTorrent client
 Summary(pl.UTF-8):	rTorrent - konsolowy klient BitTorrenta
 Name:		rtorrent
-Version:	0.8.6
-Release:	4
+Version:	0.8.9
+Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		Applications/Networking
 Source0:	http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
-# Source0-md5:	b804c45c01c40312926bcea6b55bb084
+# Source0-md5:	629247636cb1210663b52dadbd040a6c
 Patch0:		%{name}-colors.patch
 Patch1:		%{name}-ssl-no-verify.patch
 Patch2:		%{name}-ip_filter.patch
 Patch3:		%{name}-ac.patch
-Patch4:		%{name}-ncurses.patch
 URL:		http://libtorrent.rakshasa.no/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -31,7 +30,7 @@
 BuildRequires:	curl-devel >= 7.12
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
-BuildRequires:	libtorrent-devel = 1:0.12.6
+BuildRequires:	libtorrent-devel = 1:0.12.9
 BuildRequires:	ncurses-devel
 BuildRequires:	pkgconfig
 BuildRequires:	sqlite3-devel
@@ -61,7 +60,6 @@
 # broke, see TODO
 #%patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -101,6 +99,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.96  2011/06/25 13:21:59  arekm
+- up to 0.8.9
+
 Revision 1.95  2011/05/11 13:52:03  lisu
 - proper rel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rtorrent/rtorrent-colors.patch?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rtorrent/rtorrent.spec?r1=1.95&r2=1.96&f=u