[rhythmbox] Update to a newer git snapshot

[Cosimo Cecchi]

commit 6a4ec48f803c7b6a9668c37904b2bd4b75ade4d8
Author: Cosimo Cecchi <cosimoc at gnome.org>
Date:   Sat Jul 16 17:23:44 2011 -0400

    Update to a newer git snapshot

 .gitignore                             |    1 +
 rhythmbox-use-g-date-time-format.patch |  308 --------------------------------
 rhythmbox.spec                         |   18 +--
 sources                                |    2 +-
 4 files changed, 9 insertions(+), 320 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8217d5e..fa45898 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ rhythmbox-0.13.0.tar.bz2
 /rhythmbox-2.90.1.git20110316.tar.bz2
 /rhythmbox-2.90.1.git20110328.tar.bz2
 /rhythmbox-2.90.1.git20110329.tar.bz2
+/rhythmbox-2.90.1.git20110716.tar.bz2
diff --git a/rhythmbox.spec b/rhythmbox.spec
index cf7a11c..bb88576 100644
--- a/rhythmbox.spec
+++ b/rhythmbox.spec
@@ -1,12 +1,12 @@
 %define desktop_file_utils_version 0.9
 
-%define snapshot .git20110502
+%define snapshot .git20110716
 %define realversion 2.90.1
 
 Name: rhythmbox
 Summary: Music Management Application
 Version: 2.90.1
-Release: 11%{snapshot}%{?dist}
+Release: 12%{snapshot}%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -14,8 +14,6 @@ URL: http://projects.gnome.org/rhythmbox/
 #Source: http://download.gnome.org/sources/rhythmbox/0.13/%{name}-%{version}.tar.bz2
 Source: %{name}-%{realversion}%{snapshot}.tar.bz2
 
-Patch0: rhythmbox-use-g-date-time-format.patch
-
 Requires: gtk3 >= 2.91.4
 Requires: gnome-icon-theme-legacy
 Requires: media-player-info
@@ -106,10 +104,9 @@ a Rhythmbox plugin.
 %prep
 %setup -q -c rhythmbox-%{realversion} -n rhythmbox-%{realversion}
 
-%patch0 -p1 -b .datetime
-
 # 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/' '{}' ';'
+# UPNP plugin has been disabled upstream
+# find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
 
 %build
 
@@ -128,11 +125,7 @@ find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.
 make %{?_smp_mflags}
 
 %install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=%{buildroot}
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-rm -f %{buildroot}%{_libdir}/bonobo/*.{a,la}
-rm -f %{buildroot}%{_libdir}/bonobo/librb-nautilus-context-menu.so
 rm -f %{buildroot}%{_libdir}/rhythmbox/plugins/*.{a,la}
 rm -f %{buildroot}%{_libdir}/rhythmbox/plugins/*/*.{a,la}
 rm -f %{buildroot}%{_libdir}/librhythmbox-core.{a,la}
@@ -229,6 +222,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Sat Jul 16 2011 Cosimo Cecchi <cosimoc at redhat.com> - 2.90.1-12.git20110716
+- Update to a newer git snapshot
+
 * Sat Jun 18 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.90.1-11.git20110502
 - Rebuild for libmtp SONAME change.
 
diff --git a/sources b/sources
index fe49afa..676d1af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7faeec3776c8c79c017dfd43e55b6704  rhythmbox-2.90.1.git20110502.tar.bz2
+bd6a5df6d1f9f59fcfe7f59b0b45269b  rhythmbox-2.90.1.git20110716.tar.bz2