[rhythmbox] replace media-profiles.patch with upstream patch (rediffed for configure.ac)

[Adam Williamson]

commit 405811a8e868f66e0fd950b2f5e203b5914cff30
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Jan 11 23:37:28 2011 +0000

    replace media-profiles.patch with upstream patch (rediffed for configure.ac)

 ...e-media-profiles_is_now_a_separate_module.patch |   60 ++++++++++++++++++++
 rhythmbox-media-profiles.patch                     |   14 -----
 rhythmbox.spec                                     |    9 ++-
 3 files changed, 67 insertions(+), 16 deletions(-)
---
diff --git a/libgnome-media-profiles_is_now_a_separate_module.patch b/libgnome-media-profiles_is_now_a_separate_module.patch
new file mode 100644
index 0000000..4061a8f
--- /dev/null
+++ b/libgnome-media-profiles_is_now_a_separate_module.patch
@@ -0,0 +1,60 @@
+From dae77ce5437884bec29c90d5ae303816abc18434 Mon Sep 17 00:00:00 2001
+From: Jonathan Matthew <jonathan at d14n.org>
+Date: Sun, 07 Nov 2010 03:07:27 +0000
+Subject: libgnome-media-profiles is now a separate module
+
+---
+diff --git a/backends/gstreamer/rb-encoder-gst.c b/backends/gstreamer/rb-encoder-gst.c
+index 7c49878..a7530e9 100644
+--- a/backends/gstreamer/rb-encoder-gst.c
++++ b/backends/gstreamer/rb-encoder-gst.c
+@@ -35,7 +35,7 @@
+ #include <gst/gst.h>
+ #include <gst/tag/tag.h>
+ #include <string.h>
+-#include <profiles/gnome-media-profiles.h>
++#include <libgnome-media-profiles/gnome-media-profiles.h>
+ #include <gtk/gtk.h>
+ #include <gio/gio.h>
+ #include <gst/pbutils/missing-plugins.h>
+diff --git a/configure.ac b/configure.ac
+index 733c249..795a214 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,7 +44,7 @@
+ GST_0_10_REQS=0.10.20
+ GTK_REQS=2.18.0
+ GLIB_REQS=2.18.0
+-GNOME_MEDIA_PROFILES_REQS=2.8
++GNOME_MEDIA_PROFILES_REQS=2.91.0
+ LIBNOTIFY_REQS=0.4.1
+ LIBGPOD_REQS=0.6
+ MUSICBRAINZ_REQS=2.1.0
+@@ -91,7 +91,7 @@
+ 		  glib-2.0 >= $GLIB_REQS		\
+ 		  gio-2.0 >= $GLIB_REQS			\
+ 		  gio-unix-2.0 >= $GLIB_REQS		\
+-		  gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \
++		  libgnome-media-profiles-3.0 >= $GNOME_MEDIA_PROFILES_REQS \
+ 		  libsoup-2.4 >= $LIBSOUP_REQS		\
+ 		  libsoup-gnome-2.4 >= $LIBSOUP_REQS)
+ 
+
+diff --git a/sources/rb-library-source.c b/sources/rb-library-source.c
+index 9238907..380e51e 100644
+--- a/sources/rb-library-source.c
++++ b/sources/rb-library-source.c
+@@ -54,8 +54,8 @@
+ 
+ #include "rb-track-transfer-batch.h"
+ #include "rb-track-transfer-queue.h"
+-#include <profiles/gnome-media-profiles.h>
+-#include <profiles/audio-profile-choose.h>
++#include <libgnome-media-profiles/gnome-media-profiles.h>
++#include <libgnome-media-profiles/audio-profile-choose.h>
+ 
+ #include "rhythmdb.h"
+ #include "rb-debug.h"
+--
+cgit v0.8.3.1
+
diff --git a/rhythmbox.spec b/rhythmbox.spec
index bcc3005..e65b850 100644
--- a/rhythmbox.spec
+++ b/rhythmbox.spec
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.13.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -53,7 +53,7 @@ BuildRequires: perl(XML::Parser) intltool
 ExcludeArch:    s390 s390x
 
 Patch0: notify.patch
-Patch1: rhythmbox-media-profiles.patch
+Patch1: libgnome-media-profiles_is_now_a_separate_module.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -230,6 +230,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/pkgconfig/rhythmbox.pc
 
 %changelog
+* Tue Jan 11 2011 Adam Williamson <awilliam at redhat.com> 0.13.2-4
+- replace Matthias' incomplete patch for libgnome-media-profiles
+  with upstream commit dae77ce5437884bec29c90d5ae303816abc18434
+  (from gobject-introspection branch), rediffed (configure.ac)
+
 * Mon Jan 10 2011 Matthias Clasen <mclasen at redhat.com> 0.13.2-3
 - Rebuild against newer gtk