diff --git a/.cvsignore b/.cvsignore index e737e7a..7197a9a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -deluge-1.1.0_RC3.tar.bz2 +deluge-1.1.0.tar.bz2 diff --git a/deluge-fix-get_tracker_host-if-no-tracker.patch b/deluge-fix-get_tracker_host-if-no-tracker.patch deleted file mode 100644 index 2f9c943..0000000 --- a/deluge-fix-get_tracker_host-if-no-tracker.patch +++ /dev/null @@ -1,27 +0,0 @@ -If the torrent has no tracker, the call to inet_aton will fail because the -hostname is empty. This causes torrents to not be shown, or to be shown with -an error status. Replacing this parameter with host ensures that this is no -longer the case. (From upstream changeset 4492.) - -Index: /branches/1.1.0_RC/deluge/core/torrent.py -=================================================================== ---- /branches/1.1.0_RC/deluge/core/torrent.py (revision 4488) -+++ /branches/1.1.0_RC/deluge/core/torrent.py (revision 4492) -@@ -523,5 +523,5 @@ - import socket - try: -- socket.inet_aton(url.hostname) -+ socket.inet_aton(host) - except socket.error: - pass -Index: /branches/1.1.0_RC/ChangeLog -=================================================================== ---- /branches/1.1.0_RC/ChangeLog (revision 4488) -+++ /branches/1.1.0_RC/ChangeLog (revision 4492) -@@ -1,2 +1,6 @@ -+Deluge 1.1.0_RC4 (In Development) -+ Core: -+ * Fix issue in get_tracker_host when the torrent has no tracker -+ - Deluge 1.1.0_RC3 (05 January 2009) - Core: diff --git a/deluge.spec b/deluge.spec index 9475ef2..73430eb 100644 --- a/deluge.spec +++ b/deluge.spec @@ -7,19 +7,13 @@ Name: deluge Version: 1.1.0 -Release: 0.4.rc3%{?dist} +Release: 1%{?dist} Summary: A GTK+ BitTorrent client with support for DHT, UPnP, and PEX Group: Applications/Internet License: GPLv2+ URL: http://deluge-torrent.org/ -Source0: http://download.deluge-torrent.org/source/%{version}/%{name}-1.1.0_RC3.tar.bz2 - -## Fix issue in get_tracker_host when the torrent has no tracker; from -## upstream SVN (changeset 4492 - will be in 1.1.0 RC4). -## Fedora bug: https://bugzilla.redhat.com/show_bug.cgi?id=479097 -## Upstream bug: http://dev.deluge-torrent.org/ticket/704 -Patch0: %{name}-fix-get_tracker_host-if-no-tracker.patch +Source0: http://download.deluge-torrent.org/source/%{version}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -55,8 +49,7 @@ even from behind a router with virtually zero configuration of port-forwarding. %prep -%setup -qn "%{name}-1.1.0_RC3" -%patch0 -p3 -b .fix-get_tracker-host-if-no-tracker +%setup -qn "%{name}-%{version}" %build @@ -124,7 +117,7 @@ rm -rf %{buildroot} %files -f %{name}.filelist %defattr(-,root,root,-) %doc ChangeLog -%{python_sitelib}/%{name}-1.1.0_RC3-py?.?.egg-info/ +%{python_sitelib}/%{name}-%{version}-py?.?.egg-info/ %{_bindir}/%{name} %{_bindir}/%{name}d %{_datadir}/applications/fedora-%{name}.desktop @@ -151,6 +144,11 @@ fi %changelog +* Sun Jan 11 2009 Peter Gordon - 1.1.0-1 +- Update to new upstream release (1.1.0 Final - yay!) +- Drop the get_tracker_host patch (fixed upstream): + - fix-get_tracker-host-if-no-tracker.patch + * Fri Jan 09 2009 Peter Gordon - 1.1.0-0.4.rc3 - Do not package the country flags data. - Resolves: #479265 (country flags should not be used in Deluge) diff --git a/sources b/sources index ccab748..c5e026b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1d30c0e8c47159298dee31c0289a908a deluge-1.1.0_RC3.tar.bz2 +c315f7d793d55e36f4e6d22c974be8ee deluge-1.1.0.tar.bz2