From 8d2e25fa774fa803a1d2d1b83d8ac719a28c87fd Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Jun 01 2010 14:08:54 +0000
Subject: fix build with new glibc


---

diff --git a/0001-rb-client-rename-pause-to-avoid-conflict-with-pause-.patch b/0001-rb-client-rename-pause-to-avoid-conflict-with-pause-.patch
new file mode 100644
index 0000000..839294c
--- /dev/null
+++ b/0001-rb-client-rename-pause-to-avoid-conflict-with-pause-.patch
@@ -0,0 +1,52 @@
+From bd389d8e8a2b1f3a914dcd4bb17e75fb8837d78a Mon Sep 17 00:00:00 2001
+From: Jonathan Matthew <jonathan@d14n.org>
+Date: Tue, 1 Jun 2010 10:55:27 +1000
+Subject: [PATCH] rb-client: rename 'pause' to avoid conflict with pause(2) (bug #620199)
+
+---
+ remote/dbus/rb-client.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/remote/dbus/rb-client.c b/remote/dbus/rb-client.c
+index 648dd2f..5bb34a2 100644
+--- a/remote/dbus/rb-client.c
++++ b/remote/dbus/rb-client.c
+@@ -54,7 +54,7 @@ static gboolean previous = FALSE;
+ static gboolean notify = FALSE;
+ 
+ static gboolean play = FALSE;
+-static gboolean pause = FALSE;
++static gboolean do_pause = FALSE;
+ static gboolean play_pause = FALSE;
+ static gboolean stop = FALSE;
+ 
+@@ -91,7 +91,7 @@ static GOptionEntry args[] = {
+ 	{ "notify", 0, 0, G_OPTION_ARG_NONE, &notify, N_("Show notification of the playing song"), NULL },
+ 
+ 	{ "play", 0, 0, G_OPTION_ARG_NONE, &play, N_("Resume playback if currently paused"), NULL },
+-	{ "pause", 0, 0, G_OPTION_ARG_NONE, &pause, N_("Pause playback if currently playing"), NULL },
++	{ "pause", 0, 0, G_OPTION_ARG_NONE, &do_pause, N_("Pause playback if currently playing"), NULL },
+ 	{ "play-pause", 0, 0, G_OPTION_ARG_NONE, &play_pause, N_("Toggle play/pause mode"), NULL },
+ /*	{ "stop", 0, 0, G_OPTION_ARG_NONE, &stop, N_("Stop playback"), NULL }, */
+ 
+@@ -608,7 +608,7 @@ main (int argc, char **argv)
+ 	if (next || previous ||
+ 	    clear_queue ||
+ 	    play_uri || other_stuff ||
+-	    play || pause || play_pause || stop ||
++	    play || do_pause || play_pause || stop ||
+ 	    print_playing || print_playing_format || notify ||
+ 	    (set_volume > -0.01) || volume_up || volume_down || print_volume || mute || unmute || (set_rating > -0.01))
+ 		no_present = TRUE;
+@@ -696,7 +696,7 @@ main (int argc, char **argv)
+ 	org_gnome_Rhythmbox_Player_get_playing (player_proxy, &is_playing, &error);
+ 	if (!annoy (&error)) {
+ 		rb_debug ("playback state: %d", is_playing);
+-		if (play || pause || play_pause) {
++		if (play || do_pause || play_pause) {
+ 			if (is_playing != play || play_pause) {
+ 				rb_debug ("calling playPause to change playback state");
+ 				org_gnome_Rhythmbox_Player_play_pause (player_proxy, FALSE, &error);
+-- 
+1.7.0.1
+
diff --git a/rhythmbox.spec b/rhythmbox.spec
index 7b61230..b92c48e 100644
--- a/rhythmbox.spec
+++ b/rhythmbox.spec
@@ -54,6 +54,8 @@ ExcludeArch:    s390 s390x
 Patch0: rb-no-HEAD-for-podcasts.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=613606
 Patch2: 0001-Don-t-load-AFC-devices-using-the-MTP-plugin.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=620199
+Patch3: 0001-rb-client-rename-pause-to-avoid-conflict-with-pause-.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -89,6 +91,7 @@ from, and sending media to UPnP/DLNA network devices.
 
 %patch0 -p1 -b .http-head
 %patch2 -p1 -b .no-mtp-for-afc
+%patch3 -p1 -b .pause-conflict
 
 # 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/' '{}' ';'