diff --git a/.cvsignore b/.cvsignore index 809359b..db489e0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -deluge-0.5.2.tar.gz +deluge-0.5.3.tar.gz diff --git a/deluge-fix-persistence-upgrade-rhbz_247927.patch b/deluge-fix-persistence-upgrade-rhbz_247927.patch deleted file mode 100644 index 910b0ad..0000000 --- a/deluge-fix-persistence-upgrade-rhbz_247927.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- scripts/deluge.old 2007-07-11 20:28:51.000000000 -0700 -+++ scripts/deluge 2007-07-13 16:16:43.000000000 -0700 -@@ -39,6 +40,7 @@ - import os, os.path - import gettext, locale - import deluge, deluge.common, deluge.interface -+import re - try: - import dbus - dbus_version = getattr(dbus, 'version', (0,0,0)) -@@ -64,6 +66,36 @@ - - def start_deluge(): - print "Starting new Deluge session..." -+ pstate_file_path = os.getenv("HOME") + "/.config/deluge/persistent.state" -+ ## The persistent_state object moved from the deluge.deluge module to the -+ ## deluge.core module from 0.5; so let's edit the user's saved data to reflect -+ ## this. -+ if os.path.isfile(pstate_file_path): -+ try: -+ pstate_fd = open(pstate_file_path, "r") -+ pstate_data = pstate_fd.read() -+ pstate_fd.close() -+ -+ ## If the file was empty, then we should remove it so that the -+ ## pickler doesn't not attempt to unpack an empty state. -+ if len(pstate_data) is 0: -+ os.remove(pstate_file_path) -+ print "Empty persistent state data file removed successfully." -+ ## The file exists and contains data, so let's do a regex-based -+ ## find/replace to update the module name. -+ else: -+ pstate_fd_new = open(pstate_file_path, "w") -+ pstate_old_regex = re.compile("""^\(ideluge\.deluge$""", re.MULTILINE) -+ pstate_new_data = re.sub(pstate_old_regex, "(ideluge.core", pstate_data) -+ pstate_fd_new.write(pstate_new_data) -+ pstate_fd_new.close() -+ print "Persistent state data updated successfully." -+ except OSError, oopsie: -+ print >> sys.stderr, "There was an error updating the persistent.state file.\n" \ -+ "If this is an upgrade from an earlier version of Deluge, this may cause" \ -+ "bugs or failures in startup. You may wish to remove it manually." \ -+ "(%s) Continuing..." % state_file -+ print >> sys.stderr, "The error was: %s." % oopsie - interface = deluge.interface.DelugeGTK() - add_args(interface) - interface.start() diff --git a/deluge.spec b/deluge.spec index 49935fe..6a904a9 100644 --- a/deluge.spec +++ b/deluge.spec @@ -2,9 +2,9 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: deluge -Version: 0.5.2 -Release: 2%{?dist} -Summary: A GTK+ BitTorrent client with support for DHT, UPnP, and PEX. +Version: 0.5.3 +Release: 1%{?dist} +Summary: A GTK+ BitTorrent client with support for DHT, UPnP, and PEX Group: Applications/Internet License: GPL URL: http://deluge-torrent.org/ @@ -13,7 +13,6 @@ Source0: http://deluge-torrent.org/downloads/%{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 -Patch0: %{name}-fix-persistence-upgrade-rhbz_247927.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,25 +60,24 @@ even from behind a router with virtually zero configuration of port-forwarding. %setup -q ## Not building against system rb_libtorrent - see above. # install -m 0755 %{SOURCE1} ./setup.py -%patch0 -p0 -b .fix-persistence-upgrade-rhbz_247927 %build -%ifarch x86_64 ppc64 sparc64 - CFLAGS="%{optflags} -DAMD64" %{__python} setup.py build -%else - CFLAGS="%{optflags}" %{__python} setup.py build -%endif +## FIXME: This should really use %%{?_smp_mflags} or similar for parallel +## compilations; but the build system on this doesn't support such flags at +## this time. +CFLAGS="%{optflags}" %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} -desktop-file-install --vendor fedora \ +desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ - --copy-name-to-generic-name \ + --copy-name-to-generic-name \ --add-mime-type=application/x-bittorrent \ - --delete-original \ + --delete-original \ + --remove-category=Application \ %{buildroot}%{_datadir}/applications/%{name}.desktop %find_lang %{name} @@ -93,7 +91,7 @@ rm -rf %{buildroot} %doc LICENSE %{python_sitearch}/%{name}/ %{_datadir}/%{name}/ -%{_datadir}/pixmaps/%{name}.xpm +%{_datadir}/pixmaps/%{name}.png %{_datadir}/applications/fedora-%{name}.desktop %{_bindir}/%{name} @@ -107,11 +105,18 @@ update-desktop-database &> /dev/null ||: %changelog +* Fri Jul 20 2007 Peter Gordon - 0.5.3-1 +- Update to new upstream release candidate (0.5.3) +- Drop %%ifarch invocations for 64-bit builds. The internal setup script now + properly determines this and adds the AMD64 compiler definition if necessary. +- Drop stale persistence fix patch (applied upstream): + - fix-persistence-upgrade-rhbz_247927.patch + * Wed Jul 11 2007 Peter Gordon - 0.5.2-2 - Add patch to fix the existence of stale persistence files by automatically updating the deluge.deluge module name to deluge.core, or removing them if empty (bug 247927): - + fix-persistence-upgrade-rhbz_247927.patch + + fix-persistence-upgrade-rhbz_247927.patch * Sun Jul 08 2007 Peter Gordon - 0.5.2-1 - Update to new upstream release (0.5.2) diff --git a/sources b/sources index bbfe40c..0f3bb5c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a33f6b3d7cec3b27cd3044064c10d31 deluge-0.5.2.tar.gz +382141fdf1c55dc75a183da02d2239fb deluge-0.5.3.tar.gz