rpms/rhythmbox/devel path-to-mpi-files.patch, NONE, 1.1 rhythmbox.spec, 1.261, 1.262

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14879

Modified Files:
	rhythmbox.spec 
Added Files:
	path-to-mpi-files.patch 
Log Message:
* Wed Sep 02 2009 Bastien Nocera <bnocera at redhat.com> 0.12.4-3
- Add upstream patch to use the correct path for mpi files


path-to-mpi-files.patch:
 mpid-files.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE path-to-mpi-files.patch ---
>From 2dd7e3e1526a23e81bdc31cccb0b4758fb0da767 Mon Sep 17 00:00:00 2001
From: Jonathan Matthew <jonathan at d14n.org>
Date: Sun, 30 Aug 2009 12:00:37 +0000
Subject: mpid: update path to .mpi files, fix a bit of a leak

---
diff --git a/lib/libmediaplayerid/mpid-files.c b/lib/libmediaplayerid/mpid-files.c
index 5b56ed9..a5452c1 100644
--- a/lib/libmediaplayerid/mpid-files.c
+++ b/lib/libmediaplayerid/mpid-files.c
@@ -80,7 +80,7 @@ mpid_find_and_read_device_file (MPIDDevice *device, const char *device_file)
 		char *path;
 
 		filename = g_strdup_printf ("%s.mpi", device_file);
-		path = g_build_filename (data_dirs[i], "media-player-id", filename, NULL);
+		path = g_build_filename (data_dirs[i], "media-player-info", filename, NULL);
 		g_free (filename);
 		if (g_file_test (path, G_FILE_TEST_EXISTS)) {
 			device->source = MPID_SOURCE_SYSTEM;
@@ -88,6 +88,7 @@ mpid_find_and_read_device_file (MPIDDevice *device, const char *device_file)
 			g_free (path);
 			return;
 		}
+		g_free (path);
 	}
 
 	/* device info file is missing */
--
cgit v0.8.2


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -p -r1.261 -r1.262
--- rhythmbox.spec	1 Sep 2009 16:11:59 -0000	1.261
+++ rhythmbox.spec	2 Sep 2009 14:34:36 -0000	1.262
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -53,6 +53,8 @@ ExcludeArch:    s390 s390x
 Patch1: spinner.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592763
 Patch2: button-images.patch
+# http://git.gnome.org/cgit/rhythmbox/patch/?id=2dd7e3e1526a23e81bdc31cccb0b4758fb0da767
+Patch3: path-to-mpi-files.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -87,6 +89,7 @@ from, and sending media to UPnP/DLNA net
 %setup -q
 %patch1 -p1 -b .spinner
 %patch2 -p1 -b .button-images
+%patch3 -p1 -b .mpi
 
 # Use the installed louie, not the one in Coherence
 find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
@@ -221,6 +224,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Wed Sep 02 2009 Bastien Nocera <bnocera at redhat.com> 0.12.4-3
+- Add upstream patch to use the correct path for mpi files
+
 * Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 0.12.4-2
 - Remove obsolete configure flags
 - Add libgudev BR