Author: pgordon

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

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

Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/deluge/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 28 Dec 2007 17:08:24 -0000 1.23 +++ .cvsignore 1 Jan 2008 00:03:43 -0000 1.24 @@ -1 +1 @@ -deluge-0.5.7.98.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/devel/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:25 -0000 1.2 +++ deluge-default-prefs-no-release-notifications.patch 1 Jan 2008 00:03:43 -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/devel/deluge.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- deluge.spec 28 Dec 2007 17:08:24 -0000 1.43 +++ deluge.spec 1 Jan 2008 00:03:43 -0000 1.44 @@ -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 @@ ## 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 @@ %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 @@

%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)

Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/deluge/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 28 Dec 2007 17:08:24 -0000 1.23 +++ sources 1 Jan 2008 00:03:43 -0000 1.24 @@ -1 +1 @@ -bd2dd8af1b179d3757f31bc188eca821 deluge-0.5.7.98.tar.gz +afcf4fcfa3b688cb8a5cc537eb22a32e deluge-0.5.8.tar.gz

--- deluge-0.5.7.98-no-release-notification.patch DELETED ---