diff --git a/.cvsignore b/.cvsignore index 93b5f9f..3392db5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -deluge-0.5.6.95.tar.gz +deluge-0.5.6.96.tar.gz diff --git a/deluge-plugin-not-found-OK.patch b/deluge-plugin-not-found-OK.patch deleted file mode 100644 index e150e98..0000000 --- a/deluge-plugin-not-found-OK.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: tags/deluge-0.5.6.95/src/plugins.py -=================================================================== ---- tags/deluge-0.5.6.95/src/plugins.py (revision 2225) -+++ tags/deluge-0.5.6.95/src/plugins.py (revision 2309) -@@ -62,7 +62,11 @@ - if 'deluge_init' in dir(mod): - if modname != "TorrentPieces": -- print "Initialising plugin",modname -- mod.deluge_init(path) -- self.available_plugins[mod.plugin_name] = mod -+ print "Initialising plugin", modname -+ try: -+ mod.deluge_init(path) -+ except: -+ print "Cant init plugin", modname -+ else: -+ self.available_plugins[mod.plugin_name] = mod - - def get_available_plugins(self): diff --git a/deluge.spec b/deluge.spec index 1468641..4a8d90d 100644 --- a/deluge.spec +++ b/deluge.spec @@ -2,7 +2,7 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: deluge -Version: 0.5.6.95 +Version: 0.5.6.96 Release: 1%{?dist} Summary: A GTK+ BitTorrent client with support for DHT, UPnP, and PEX Group: Applications/Internet @@ -15,7 +15,6 @@ Source0: http://download.deluge-torrent.org/tarball/%{version}/%{name}-%{version # Source1: %{name}-fixed-setup.py Patch1: %{name}-default-prefs-no-release-notifications.patch -Patch2: %{name}-plugin-not-found-OK.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,7 +64,6 @@ even from behind a router with virtually zero configuration of port-forwarding. ## Not building against system rb_libtorrent - see above. # install -m 0755 %{SOURCE1} ./setup.py %patch1 -b .default-prefs-no-release-notifications -%patch2 -p2 -b .no-death-on-missing-plugin %build @@ -111,6 +109,11 @@ update-desktop-database &> /dev/null ||: %changelog +* Sat Nov 24 2007 Peter Gordon - 0.5.6.96-1 +- Update to new upstream release candidate (0.5.7 RC2) +- Drop plugin error patch (fixed upstream): + - plugin-not-found-OK.patch + * Sat Nov 24 2007 Peter Gordon - 0.5.6.95-1 - Update to new upstream release candidate (0.5.7 RC) - Update Source0 url diff --git a/sources b/sources index 7cc2863..4f9c549 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5216c7ad77de72611befa728d2a3b19f deluge-0.5.6.95.tar.gz +01378f7859c840ecd8e0da5d21e2b839 deluge-0.5.6.96.tar.gz