rpms/rhythmbox/F-10 rb-avahi-assertion.patch, NONE, 1.1 rhythmbox.spec, 1.218, 1.219

[Brian Pepple]

Author: bpepple

Update of /cvs/pkgs/rpms/rhythmbox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv851

Modified Files:
	rhythmbox.spec 
Added Files:
	rb-avahi-assertion.patch 
Log Message:
* Mon Jan 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.11.6-19.r6096
- Backport patch to fix avahi assertion in DAAP plugin.
- Better URL
- Tweak description


rb-avahi-assertion.patch:

--- NEW FILE rb-avahi-assertion.patch ---
--- trunk/plugins/daap/rb-daap-mdns-avahi.c	2008/12/17 10:44:50	6103
+++ trunk/plugins/daap/rb-daap-mdns-avahi.c	2008/12/18 02:27:16	6104
@@ -114,7 +114,9 @@
 void
 rb_daap_mdns_avahi_set_entry_group (AvahiEntryGroup *eg)
 {
-	g_assert (eg == NULL || entry_group == NULL);
-	g_assert (avahi_entry_group_get_client (eg) == client);
+	if (eg != NULL) {
+		g_assert (entry_group == NULL);
+		g_assert (avahi_entry_group_get_client (eg) == client);
+	}
 	entry_group = eg;
 }


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-10/rhythmbox.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- rhythmbox.spec	13 Jan 2009 12:11:06 -0000	1.218
+++ rhythmbox.spec	19 Jan 2009 16:38:15 -0000	1.219
@@ -3,10 +3,10 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.6
-Release: 18.r6096%{?dist}
+Release: 19.r6096%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
-URL: http://www.gnome.org/projects/rhythmbox/
+URL: http://projects.gnome.org/rhythmbox/
 #Source: http://download.gnome.org/sources/rhythmbox/0.11/%{name}-%{version}.tar.bz2
 Source: %{name}-%{version}-r6096.tar.gz
 Source1: rhythmbox-iradio-initial.pls
@@ -55,19 +55,25 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=428034
 Patch0: rb-disable-power-plugin-by-default.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=562188
+Patch1: rb-avahi-assertion.patch
+
 %description
 Rhythmbox is an integrated music management application based on the powerful
 GStreamer media framework. It has a number of features, including an easy to
 use music browser, searching and sorting, comprehensive audio format support
 through GStreamer, Internet Radio support, playlists and more.
 
+Rhythmbox is extensible through a plugin system.
+
 %package lirc
 Summary: LIRC (Infrared remote) plugin for Rhythmbox
 Group: Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 
 %description lirc
-A plugin to add LIRC (Infrared remote) support to Rhythmbox.
+This package contains a plugin to add LIRC (Infrared remote) support 
+to Rhythmbox.
 
 %package upnp
 Summary: UPNP/DLNA plugin for Rhythmbox
@@ -77,13 +83,14 @@
 Requires: python-louie python-twisted
 
 %description upnp
-A plugin to add support to Rhythmbox, for playing media from, and sending media to
-UPnP/DLNA network devices.
+This package contains a Rhythmbox plugin to add support for playing media 
+from, and sending media to UPnP/DLNA network devices.
 
 %prep
 %setup -q
 
 %patch0 -p0 -b .dont-disable-suspend
+%patch1 -p1 -b .avahi-assertion
 
 %build
 
@@ -220,6 +227,11 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Mon Jan 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.11.6-19.r6096
+- Backport patch to fix avahi assertion in DAAP plugin.
+- Better URL
+- Tweak description
+
 * Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.11.6-18.r6096
 - Add more Python deps for the UPNP plugin (#474372)