rpms/deluge/devel deluge-plugin-not-found-OK.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 deluge.spec, 1.33, 1.34 sources, 1.17, 1.18

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8397

Modified Files:
	.cvsignore deluge.spec sources 
Added Files:
	deluge-plugin-not-found-OK.patch 
Log Message:
Update to 0.5.6.95 (0.5.7 RC)

deluge-plugin-not-found-OK.patch:

--- NEW FILE deluge-plugin-not-found-OK.patch ---
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):


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Nov 2007 00:21:13 -0000	1.17
+++ .cvsignore	25 Nov 2007 00:01:30 -0000	1.18
@@ -1 +1 @@
-deluge-0.5.6.2.tar.gz
+deluge-0.5.6.95.tar.gz


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- deluge.spec	1 Nov 2007 00:21:13 -0000	1.33
+++ deluge.spec	25 Nov 2007 00:01:30 -0000	1.34
@@ -2,18 +2,20 @@
 %{!?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.2
+Version:	0.5.6.95
 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://deluge-torrent.org/downloads/%{name}-%{version}.tar.gz
+Source0:	http://download.deluge-torrent.org/tarball/%{version}/%{name}-%{version}.tar.gz
 ## Not used for now: Deluge builds against its own internal copy of
 ## rb_libtorrent. See below for more details. 
 # 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)
 
@@ -29,6 +31,7 @@
 Requires:	/bin/sh
 Requires:	dbus-python
 Requires:	pygtk2-libglade
+Requires:	pyOpenSSL
 Requires:	pyxdg
 ## Deluge is now using its own internal copy of rb_libtorrent, which they have
 ## heavily modified. Patches were sent to the upstream rb_libtorrent devs,
@@ -62,6 +65,7 @@
 ## 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
@@ -107,6 +111,13 @@
 
 
 %changelog
+* Sat Nov 24 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.6.95-1
+- Update to new upstream release candidate (0.5.7 RC)
+- Update Source0 url
+- Add upstream patch to prevent dying if plugin in prefs.state is not found on
+  the filesystem:
+  + plugin-not-found-OK.patch
+
 * Wed Oct 31 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.6.2-1
 - Update to new upstream bug-fix release (0.5.6.2)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	1 Nov 2007 00:21:13 -0000	1.17
+++ sources	25 Nov 2007 00:01:30 -0000	1.18
@@ -1 +1 @@
-774c71a72ee588b9079fadb07f2efe0d  deluge-0.5.6.2.tar.gz
+5216c7ad77de72611befa728d2a3b19f  deluge-0.5.6.95.tar.gz