[deluge/f13/master] Update to 1.3.0; and add patch to fix #615984.

[Peter Gordon]

commit 5d1a7bfb6640de674e4ac70b4f2d8afb9d9f1854
Author: Peter Gordon <peter at thecodergeek.com>
Date:   Thu Oct 14 00:02:59 2010 -0700

    Update to 1.3.0; and add patch to fix #615984.

 .gitignore  |    3 +++
 deluge.spec |   25 +++++++++++++++++--------
 sources     |    4 +++-
 3 files changed, 23 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bc78abd..012ad03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 deluge-1.2.3.tar.lzma
+/deluge-desktop-categories-p2p.diff
+/deluge-scalable-icon-dir.diff
+/deluge-1.3.0.tar.lzma
diff --git a/deluge.spec b/deluge.spec
index 9fa3e6b..d15e876 100644
--- a/deluge.spec
+++ b/deluge.spec
@@ -1,16 +1,18 @@
 Name:		deluge
-Version:	1.2.3
-Release:	2%{?dist}
+Version:	1.3.0
+Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
 License:	GPLv3 with exceptions
 
-URL:	http://deluge-torrent.org/
+URL:		http://deluge-torrent.org/           
 
-Source0:	http://download.deluge-torrent.org/source/%{name}-%{version}.tar.lzma
+Source0:	http://download.deluge-torrent.org/source/%{version}/%{name}-%{version}.tar.lzma
 
 ## The scalable icon needs to be installed to the proper place.
-Patch0:		%{name}-scalable-icon-dir.diff
+Patch0: 	%{name}-scalable-icon-dir.diff
+## Add P2P to the Categories in the .desktop file (#615984).
+Patch1: 	%{name}-desktop-categories-p2p.diff
 
 BuildArch:	noarch
 
@@ -56,6 +58,7 @@ display the location of peers in the "Peers" information tab.
 %prep
 %setup -q
 %patch0 -p0 -b .fix-scalable-icon-dir
+%patch1 -p0 -b .desktop-categories-add-p2p
 
 
 %build
@@ -73,8 +76,8 @@ desktop-file-install --vendor fedora			\
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
 
 ## NOTE: The lang files should REEEAALLLY be in a standard place such as
-## /usr/share/locale or similar. It'd make things so much nicer for
-## the packaging. :O
+##       /usr/share/locale or similar. It'd make things so much nicer for
+##       the packaging. :O
 ## A bit of sed magic to mark the translation files with %%lang, taken from
 ## find-lang.sh (part of the rpm-build package) and tweaked somewhat. We
 ## cannot (unfortunately) call find-lang directly since it's not on a
@@ -95,7 +98,7 @@ pushd %{buildroot}
 ## entries for the .mo files which we've already marked with appropriate
 ## %%lang-fu. 
 	find ./%{python_sitelib}/%{name} -not -iname '%{name}.mo' -type f \
-		| grep -v 'pixmaps/flags' | sed 's:^\./::' >> %{name}.filelist
+		| grep -v 'pixmaps/flags' | sed -e 's:^\./::' -e 's| |*|g' >> %{name}.filelist
 	find ./%{python_sitelib}/%{name} -type d  | grep -v 'pixmaps/flags' \
 		| sed 's:^\./:%%dir :' >> %{name}.filelist
 
@@ -140,6 +143,12 @@ fi
 
 
 %changelog
+* Wed Oct 13 2010 Peter Gordon <peter at thecodergeek.com> - 1.3.0-1
+- Update to new upstream release (1.3.0).
+- Add P2P to the .desktop file Categories list.
+  + desktop-categories-p2p.diff
+- Resolves: #615984 (.desktop menu entry has wrong/missing categories)
+
 * Fri May 28 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 1.2.3-2
 - Rebuild for new rb_libtorrent which is needed to fix E-V-R
 - Fix Source URL
diff --git a/sources b/sources
index ff7ea13..716b740 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-4ae150fbd021d4d32c8c9038f29a9db2  deluge-1.2.3.tar.lzma
+7a17d1e8e1be375641ef8ff96fde63f1  deluge-desktop-categories-p2p.diff
+0c5c8cd213b70d5ec1459bbebb498960  deluge-scalable-icon-dir.diff
+34481c8c483ddb2c11faf46c9001d1bb  deluge-1.3.0.tar.lzma