rpms/rhythmbox/F-7 rhythmbox-0.10.1-jamendo-neg-tracknum.patch, NONE, 1.1 rhythmbox.spec, 1.118, 1.119

[Bastien Nocera (hadess)]

Author: hadess

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

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.10.1-jamendo-neg-tracknum.patch 
Log Message:
* Mon Nov 12 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-6.fc7
- Add upstream patch to avoid crashing when the Jamendo catalogue feeds
  us negative track numbers (#372731)


rhythmbox-0.10.1-jamendo-neg-tracknum.patch:

--- NEW FILE rhythmbox-0.10.1-jamendo-neg-tracknum.patch ---
Index: plugins/jamendo/jamendo/JamendoSource.py
===================================================================
--- plugins/jamendo/jamendo/JamendoSource.py	(revision 5440)
+++ plugins/jamendo/jamendo/JamendoSource.py	(working copy)
@@ -318,7 +318,10 @@
 						self.__db.set(entry, rhythmdb.PROP_ARTIST, artist['dispname'])
 						self.__db.set(entry, rhythmdb.PROP_GENRE, artist['genre'])
 					self.__db.set(entry, rhythmdb.PROP_ALBUM, album['dispname'])
-					self.__db.set(entry, rhythmdb.PROP_TRACK_NUMBER, int(track['trackno']))
+
+					trackno = int(track['trackno'])
+					if trackno >= 0:
+						self.__db.set(entry, rhythmdb.PROP_TRACK_NUMBER, trackno)
 					self.__db.set(entry, rhythmdb.PROP_DURATION, int(track['lengths']))
 
 					self.__p2plinks[stream] = album['P2PLinks']


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-7/rhythmbox.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- rhythmbox.spec	30 Oct 2007 17:31:47 -0000	1.118
+++ rhythmbox.spec	12 Nov 2007 03:47:28 -0000	1.119
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.10.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -53,6 +53,8 @@
 Patch5: rb-disable-local-uri-escaping-5.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=357951
 Patch6: rhythmbox-0.10.1-fix-metadata-trailing-space.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=372731
+Patch7: rhythmbox-0.10.1-jamendo-neg-tracknum.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -73,6 +75,7 @@
 %patch4 -p1 -b .ipod-podcasts
 %patch5 -p0 -b .uri-escaping
 %patch6 -p2 -b .trailing-space
+%patch7 -p0 -b .neg-tracknum
 
 %build
 
@@ -161,6 +164,10 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Mon Nov 12 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-6.fc7
+- Add upstream patch to avoid crashing when the Jamendo catalogue feeds
+  us negative track numbers (#372731)
+
 * Tue Oct 30 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-5.fc7
 - Add patch to fix problems with metadata loss when it has a space at the
   end of it (#357951)