[rhythmbox/f16] Update to a newer git snapshot

[Cosimo Cecchi]

commit 60f5564afe7054797bd45d650f8e873971aca29b
Author: Cosimo Cecchi <cosimoc at gnome.org>
Date:   Tue Sep 27 11:21:28 2011 -0400

    Update to a newer git snapshot

 .gitignore     |    1 +
 rhythmbox.spec |   34 ++++++++--------------------------
 sources        |    2 +-
 3 files changed, 10 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 98c2d27..5629c4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ rhythmbox-0.13.0.tar.bz2
 /rhythmbox-2.90.1.git20110822.tar.xz
 /rhythmbox-2.90.1.git20110823.tar.xz
 /rhythmbox-2.90.1.git20110829.tar.xz
+/rhythmbox-2.90.1.git20110927.tar.xz
diff --git a/rhythmbox.spec b/rhythmbox.spec
index 7bb09c4..1228bc8 100644
--- a/rhythmbox.spec
+++ b/rhythmbox.spec
@@ -1,12 +1,12 @@
 %define desktop_file_utils_version 0.9
 
-%define snapshot .git20110829
+%define snapshot .git20110927
 %define realversion 2.90.1
 
 Name: rhythmbox
 Summary: Music Management Application
 Version: 2.90.1
-Release: 16%{snapshot}%{?dist}
+Release: 17%{snapshot}%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -57,10 +57,10 @@ BuildRequires: gnome-common
 BuildRequires: clutter-gtk-devel
 BuildRequires: clutter-gst-devel
 BuildRequires: libmx-devel
+BuildRequires: grilo-devel
 
 ExcludeArch:    s390 s390x
 
-# UPNP plugin has been disabled upstream
 Obsoletes: rhythmbox-upnp < %{version}-%{release}
 Provides: rhythmbox-upnp = %{version}-%{release}
 
@@ -81,19 +81,6 @@ Requires: %{name} = %{version}-%{release}
 This package contains a plugin to add LIRC (Infrared remote) support 
 to Rhythmbox.
 
-# UPNP plugin has been disabled upstream
-#%package upnp
-#Summary: UPNP/DLNA plugin for Rhythmbox
-#Group: Applications/Multimedia
-#Requires: %{name} = %{version}-%{release}
-#Requires: python-Coherence
-#Requires: python-louie python-twisted
-
-
-#%description upnp
-#This package contains a Rhythmbox plugin to add support for playing media 
-#from, and sending media to UPnP/DLNA network devices.
-
 %package devel
 Summary: Development files for Rhythmbox plugins
 Group: Development/Libraries
@@ -107,10 +94,6 @@ a Rhythmbox plugin.
 %prep
 %setup -q -n rhythmbox
 
-# Use the installed louie, not the one in Coherence
-# UPNP plugin has been disabled upstream
-# find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
-
 %build
 
 # work around a gstreamer bug
@@ -190,10 +173,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %{_libdir}/rhythmbox/plugins/dbus-media-server/
 %{_libdir}/rhythmbox/plugins/fmradio/
 %{_libdir}/rhythmbox/plugins/generic-player/
+%{_libdir}/rhythmbox/plugins/grilo/
 %{_libdir}/rhythmbox/plugins/im-status/
 %{_libdir}/rhythmbox/plugins/ipod/
 %{_libdir}/rhythmbox/plugins/iradio/
-%{_libdir}/rhythmbox/plugins/jamendo/
 %{_libdir}/rhythmbox/plugins/lyrics/
 %{_libdir}/rhythmbox/plugins/magnatune/
 %{_libdir}/rhythmbox/plugins/mmkeys/
@@ -214,11 +197,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %defattr(-, root, root)
 %{_libdir}/rhythmbox/plugins/rblirc
 
-# UPNP plugin has been disabled upstream
-#%files upnp
-#%defattr(-, root, root)
-#%{_libdir}/rhythmbox/plugins/upnp_coherence
-
 %files devel
 %defattr(-, root, root)
 %{_includedir}/rhythmbox
@@ -226,6 +204,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Tue Sep 27 2011 Cosimo Cecchi <cosimoc at redhat.com> - 2.90.1-17.git20110927
+- Update to a newer git snapshot
+- Include the new Grilo-based plugin, obsoletes the UPNP and Jamendo plugins
+
 * Tue Sep 20 2011 Matthias Clasen <mclasen at redhat.com> - 2.90.1-16.git20110829
 - Rebuild against newer clutter
 
diff --git a/sources b/sources
index 181b08f..989f0f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29d9ce148f6c4f2530ae1a2e79ccecae  rhythmbox-2.90.1.git20110829.tar.xz
+40c8ff35bbc7b4a5dd02f84b96e49c85  rhythmbox-2.90.1.git20110927.tar.xz