From b914a06a577daffe888f54235024cb6037da8515 Mon Sep 17 00:00:00 2001
From: Peter Gordon <pgordon@fedoraproject.org>
Date: Jan 01 2008 00:03:43 +0000
Subject: Update to 0.5.8, merging the no-notifications patches.


---

diff --git a/.cvsignore b/.cvsignore
index cd5c26c..28a388c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-deluge-0.5.7.98.tar.gz
+deluge-0.5.8.tar.gz
diff --git a/deluge-0.5.7.98-no-release-notification.patch b/deluge-0.5.7.98-no-release-notification.patch
deleted file mode 100644
index 37879d4..0000000
--- a/deluge-0.5.7.98-no-release-notification.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- deluge-torrent-0.5.7.98/src/interface.py.notify	2007-12-26 02:39:31.000000000 +0900
-+++ deluge-torrent-0.5.7.98/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
diff --git a/deluge-default-prefs-no-release-notifications.patch b/deluge-default-prefs-no-release-notifications.patch
index 83a84bf..f8fa319 100644
--- a/deluge-default-prefs-no-release-notifications.patch
+++ b/deluge-default-prefs-no-release-notifications.patch
@@ -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
diff --git a/deluge.spec b/deluge.spec
index fb7dfe0..47817bb 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.7.98
+Version:	0.5.8
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
@@ -14,8 +14,7 @@ Source0:	http://download.deluge-torrent.org/tarball/%{version}/%{name}-%{version
 ## rb_libtorrent. See below for more details. 
 # Source1:	%{name}-fixed-setup.py
 
-#Patch1: 	%{name}-default-prefs-no-release-notifications.patch
-Patch1:		deluge-0.5.7.98-no-release-notification.patch
+Patch1: 	%{name}-default-prefs-no-release-notifications.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -66,8 +65,7 @@ even from behind a router with virtually zero configuration of port-forwarding.
 %setup -qn "deluge-torrent-%{version}"
 ## Not building against system rb_libtorrent - see above.
 # install -m 0755 %{SOURCE1} ./setup.py
-#%%patch1 -b .default-prefs-no-release-notifications
-%patch1 -p1 -b .notify
+%patch1 -b .default-prefs-no-release-notifications
 
 
 %build
@@ -124,6 +122,11 @@ fi
 
 
 %changelog
+* Mon Dec 31 2007 Peter Gordon <peter@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.
+  
 * Sat Dec 29 2007 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.5.7.98-1
 - Update to new upstream release candidate (0.5.8 RC2)
 
diff --git a/sources b/sources
index 8241aba..7f67f6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bd2dd8af1b179d3757f31bc188eca821  deluge-0.5.7.98.tar.gz
+afcf4fcfa3b688cb8a5cc537eb22a32e  deluge-0.5.8.tar.gz