rpms/rhythmbox/F-8 rb-fix-broken-daap-playback.patch, NONE, 1.1 rhythmbox.spec, 1.145, 1.146 rb-disable-broken-daap-stream-playback.patch, 1.1, NONE

[Bastien Nocera (hadess)]

Author: hadess

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

Modified Files:
	rhythmbox.spec 
Added Files:
	rb-fix-broken-daap-playback.patch 
Removed Files:
	rb-disable-broken-daap-stream-playback.patch 
Log Message:
* Sat Nov 17 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.3-4
- Better DAAP fix (#382351)


rb-fix-broken-daap-playback.patch:

--- NEW FILE rb-fix-broken-daap-playback.patch ---
Index: plugins/daap/rb-daap-connection.c
===================================================================
--- plugins/daap/rb-daap-connection.c	(revision 5447)
+++ plugins/daap/rb-daap-connection.c	(working copy)
@@ -1055,7 +1055,7 @@
 		entry_set_string_prop (priv->db, entry, RHYTHMDB_PROP_GENRE, genre);
 
 		/* stream URI property is stored as a mountpoint for get_playback_uri */
-		if (streamURI) {
+		if (streamURI && *streamURI != '\0') {
 			entry_set_string_prop (priv->db, entry, RHYTHMDB_PROP_MOUNTPOINT, streamURI);
 		}
 


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-8/rhythmbox.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- rhythmbox.spec	16 Nov 2007 17:02:50 -0000	1.145
+++ rhythmbox.spec	17 Nov 2007 13:51:21 -0000	1.146
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -49,7 +49,8 @@
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=346434
 Patch1: rb-delete-ipod-tracks.patch
-Patch2: rb-disable-broken-daap-stream-playback.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=497430
+Patch2: rb-fix-broken-daap-playback.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -81,9 +82,7 @@
 pushd plugins/ipod/
 %patch1 -p0 -b .ipod-trash
 popd
-pushd plugins/daap/
 %patch2 -p0 -b .broken-daap
-popd
 
 %build
 
@@ -194,6 +193,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Sat Nov 17 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.3-4
+- Better DAAP fix (#382351)
+
 * Fri Nov 16 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.3-3
 - Try to fix DAAP playback (#382351)
 


--- rb-disable-broken-daap-stream-playback.patch DELETED ---