rpms/deluge/F-7 .cvsignore, 1.17, 1.18 deluge-default-prefs-no-release-notifications.patch, 1.2, 1.3 deluge.spec, 1.29, 1.30 sources, 1.17, 1.18 deluge-0.5.7.1-default-prefs-no-release-notifications.patch, 1.1, NONE

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21611/F-7

Modified Files:
	.cvsignore deluge-default-prefs-no-release-notifications.patch 
	deluge.spec sources 
Removed Files:
	deluge-0.5.7.1-default-prefs-no-release-notifications.patch 
Log Message:
Update to 0.5.8, merging the patches.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-7/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	9 Dec 2007 19:30:02 -0000	1.17
+++ .cvsignore	3 Jan 2008 04:41:03 -0000	1.18
@@ -1 +1 @@
-deluge-0.5.7.1.tar.gz
+deluge-0.5.8.tar.gz

deluge-default-prefs-no-release-notifications.patch:

Index: deluge-default-prefs-no-release-notifications.patch
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-7/deluge-default-prefs-no-release-notifications.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- deluge-default-prefs-no-release-notifications.patch	21 Sep 2007 19:20:27 -0000	1.2
+++ deluge-default-prefs-no-release-notifications.patch	3 Jan 2008 04:41:03 -0000	1.3
@@ -9,3 +9,13 @@
      "window_height" : 480,
      "window_maximized" : False,
      "window_pane_position" : -1,
+--- src/interface.py.old	2007-12-26 02:39:31.000000000 +0900
++++ src/interface.py	2007-12-29 01:05:36.000000000 +0900
+@@ -1065,6 +1065,7 @@
+             self.manager.quit()
+ 
+     def new_release_check(self):
++        return
+         import socket
+         import urllib2
+         timeout = 5


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-7/deluge.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- deluge.spec	24 Dec 2007 14:48:08 -0000	1.29
+++ deluge.spec	3 Jan 2008 04:41:03 -0000	1.30
@@ -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.7.1
+Version:	0.5.8
 Release:	2%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
@@ -14,8 +14,7 @@
 ## rb_libtorrent. See below for more details. 
 # Source1:	%{name}-fixed-setup.py
 
-#Patch0: 	%{name}-default-prefs-no-release-notifications.patch
-Patch0:		deluge-0.5.7.1-default-prefs-no-release-notifications.patch
+Patch0: 	%{name}-default-prefs-no-release-notifications.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -66,8 +65,7 @@
 %setup -qn "deluge-torrent-%{version}"
 ## Not building against system rb_libtorrent - see above.
 # install -m 0755 %{SOURCE1} ./setup.py
-#%%patch0 -b .default-prefs-no-release-notifications
-%patch0 -p1 -b .release-notify
+%patch0 -b .default-prefs-no-release-notifications
 
 
 %build
@@ -122,6 +120,11 @@
 
 
 %changelog
+* Wed Jan 02 2008 Peter Gordon <peter at thecodergeek.com> - 0.5.8-1
+- Update to new upstream release (0.5.8)
+- Merge Mamoru Tasaka's no-release-notification patch into the default-prefs
+  patch.
+
 * Mon Dec 24 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7.1-2
 - Completely suppress updates notification (bug 299601, 426642)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-7/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	9 Dec 2007 19:30:02 -0000	1.17
+++ sources	3 Jan 2008 04:41:03 -0000	1.18
@@ -1 +1 @@
-375d82f18953ddfd26229b76e63dc3cb  deluge-0.5.7.1.tar.gz
+afcf4fcfa3b688cb8a5cc537eb22a32e  deluge-0.5.8.tar.gz


--- deluge-0.5.7.1-default-prefs-no-release-notifications.patch DELETED ---