diff --git a/.gitignore b/.gitignore index 356e007..a94dd20 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/deluge-1.3.12.tar.bz2 +/deluge-1.3.13.tar.bz2 diff --git a/deluge-gtk-column-types.patch b/deluge-gtk-column-types.patch deleted file mode 100644 index c43f2c0..0000000 --- a/deluge-gtk-column-types.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 58d385241fd235ab68d5372eaa44b6ef16f46c4d Mon Sep 17 00:00:00 2001 -From: Calum Lind -Date: Sun, 20 Sep 2015 15:39:04 +0100 -Subject: [#2762] [GTKUI] Use correct column types for data - ---- - deluge/ui/gtkui/torrentview.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py -index 80f49fb..7c68cbc 100644 ---- a/deluge/ui/gtkui/torrentview.py -+++ b/deluge/ui/gtkui/torrentview.py -@@ -277,9 +277,9 @@ class TorrentView(listview.ListView, component.Component): - sort_func=seed_peer_column_sort, default=False) - self.add_func_column(_("Seeders") + "/" + _("Peers"), listview.cell_data_ratio, [float], - status_field=["seeds_peers_ratio"], default=False) -- self.add_func_column(_("Down Speed"), listview.cell_data_speed, [float], -+ self.add_func_column(_("Down Speed"), listview.cell_data_speed, [int], - status_field=["download_payload_rate"]) -- self.add_func_column(_("Up Speed"), listview.cell_data_speed, [float], -+ self.add_func_column(_("Up Speed"), listview.cell_data_speed, [int], - status_field=["upload_payload_rate"]) - self.add_func_column(_("Down Limit"), listview.cell_data_speed_limit, [float], - status_field=["max_download_speed"], default=False) -@@ -291,7 +291,7 @@ class TorrentView(listview.ListView, component.Component): - status_field=["ratio"], default=False) - self.add_func_column(_("Avail"), listview.cell_data_ratio, [float], - status_field=["distributed_copies"], default=False) -- self.add_func_column(_("Added"), listview.cell_data_date, [float], -+ self.add_func_column(_("Added"), listview.cell_data_date, [int], - status_field=["time_added"], default=False) - self.add_texticon_column(_("Tracker"), - status_field=["tracker_host", "tracker_host"], --- -cgit v0.12 - diff --git a/deluge-gtk-invalid-magnet.patch b/deluge-gtk-invalid-magnet.patch deleted file mode 100644 index da6e381..0000000 --- a/deluge-gtk-invalid-magnet.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 58059300bde65f0b45c6177b123e6957c3c814d5 Mon Sep 17 00:00:00 2001 -From: Calum Lind -Date: Sun, 20 Sep 2015 15:19:32 +0100 -Subject: [#2763] [GTKUI] Fix unhandled error with invalid magnet uri - ---- - deluge/ui/gtkui/addtorrentdialog.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/deluge/ui/gtkui/addtorrentdialog.py b/deluge/ui/gtkui/addtorrentdialog.py -index 195ac60..8b8d9c5 100644 ---- a/deluge/ui/gtkui/addtorrentdialog.py -+++ b/deluge/ui/gtkui/addtorrentdialog.py -@@ -251,12 +251,16 @@ class AddTorrentDialog(component.Component): - - for uri in uris: - s = uri.split("&")[0][20:] -+ info_hash = None - if len(s) == 32: - info_hash = base64.b32decode(s).encode("hex") - elif len(s) == 40: - info_hash = s -+ if info_hash is None: -+ log.error("Invalid info_hash in uri: %s", uri) -+ continue - if info_hash in self.infos: -- log.debug("Torrent already in list!") -+ log.debug("Torrent already in list: %s", uri) - continue - name = None - for i in uri.split("&"): --- -cgit v0.12 - diff --git a/deluge.spec b/deluge.spec index e5d5a38..3cbda12 100644 --- a/deluge.spec +++ b/deluge.spec @@ -1,6 +1,6 @@ Name: deluge -Version: 1.3.12 -Release: 4%{?dist} +Version: 1.3.13 +Release: 1%{?dist} Summary: A GTK+ BitTorrent client with support for DHT, UPnP, and PEX Group: Applications/Internet License: GPLv3 with exceptions @@ -10,10 +10,6 @@ Source1: deluge-daemon.service Source2: deluge-web.service # Prevent crashes in Create Torrent dialog for non-English languages Patch1: deluge-createtorrentdialog.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1219582 -Patch2: deluge-gtk-column-types.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1223058 -Patch3: deluge-gtk-invalid-magnet.patch BuildArch: noarch BuildRequires: desktop-file-utils @@ -116,8 +112,6 @@ Files for the Deluge daemon %prep %setup -q %patch1 -p1 -b .createtorrentdialog -%patch2 -p1 -b .gtk-column-types -%patch3 -p1 -b .gtk-invalid-magnet # remove bundled copy of python-rencode # http://dev.deluge-torrent.org/ticket/2326 @@ -282,6 +276,9 @@ fi gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Wed Jul 20 2016 Michael Cronenworth - 1.3.13-1 +- update to 1.3.13 + * Tue Jul 19 2016 Fedora Release Engineering - 1.3.12-4 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages diff --git a/sources b/sources index cd2a622..ed753c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d37714daf1e859e570a9446baa027dd3 deluge-1.3.12.tar.bz2 +07040dd05dd2fcda344e5fd3d2cd018b deluge-1.3.13.tar.bz2