[audacious/f15] Merge some post-2.5.2 fixes from git.

[Michael Schwendt]

commit 9db12cd327f80315109e31d10b71e8ba5ca67498
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Wed Jun 29 22:29:02 2011 +0200

    Merge some post-2.5.2 fixes from git.

 audacious-2.5.2-git20110628.patch |   48 +++++++++++++++++++++++++++++++++++++
 audacious.spec                    |    8 +++++-
 2 files changed, 55 insertions(+), 1 deletions(-)
---
diff --git a/audacious-2.5.2-git20110628.patch b/audacious-2.5.2-git20110628.patch
new file mode 100644
index 0000000..80392c1
--- /dev/null
+++ b/audacious-2.5.2-git20110628.patch
@@ -0,0 +1,48 @@
+diff -Nur audacious-2.5.2/src/audacious/drct.c audacious-2.5.2-20110628/src/audacious/drct.c
+--- audacious-2.5.2/src/audacious/drct.c	2011-06-20 03:14:01.000000000 +0200
++++ audacious-2.5.2-20110628/src/audacious/drct.c	2011-06-29 22:21:47.396220334 +0200
+@@ -50,7 +50,10 @@
+             playback_seek (0);
+     }
+     else
++    {
++        playlist_set_playing (playlist_get_active ());
+         playback_play (0, FALSE);
++    }
+ }
+ 
+ void drct_pause (void)
+diff -Nur audacious-2.5.2/src/audacious/main.c audacious-2.5.2-20110628/src/audacious/main.c
+--- audacious-2.5.2/src/audacious/main.c	2011-06-20 03:14:01.000000000 +0200
++++ audacious-2.5.2-20110628/src/audacious/main.c	2011-06-29 22:21:47.396220334 +0200
+@@ -133,12 +133,18 @@
+ static void relocate_path (gchar * * pathp, const gchar * old, const gchar * new)
+ {
+     gchar * path = * pathp;
+-    gint len = strlen (old);
++    gint oldlen = strlen (old);
++    gint newlen = strlen (new);
++
++    if (oldlen && old[oldlen - 1] == G_DIR_SEPARATOR)
++        oldlen --;
++    if (newlen && new[newlen - 1] == G_DIR_SEPARATOR)
++        newlen --;
+ 
+ #ifdef _WIN32
+-    if (strncasecmp (path, old, len))
++    if (strncasecmp (path, old, oldlen) || (path[oldlen] && path[oldlen] != G_DIR_SEPARATOR))
+ #else
+-    if (strncmp (path, old, len))
++    if (strncmp (path, old, oldlen) || (path[oldlen] && path[oldlen] != G_DIR_SEPARATOR))
+ #endif
+     {
+         fprintf (stderr, "Failed to relocate a data path.  Falling back to "
+@@ -146,7 +152,7 @@
+         return;
+     }
+ 
+-    * pathp = g_strconcat (new, path + len, NULL);
++    * pathp = g_strdup_printf ("%.*s%s", newlen, new, path + oldlen);
+     g_free (path);
+ }
+ 
diff --git a/audacious.spec b/audacious.spec
index d294201..7eeff82 100644
--- a/audacious.spec
+++ b/audacious.spec
@@ -6,7 +6,7 @@
 
 Name: audacious
 Version: 2.5.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv3
 Summary: Advanced audio player
@@ -17,6 +17,8 @@ Source0: http://distfiles.atheme.org/audacious-%{version}.tar.bz2
 
 # Fedora customization (RFE bz #632388)
 Patch1: audacious-2.4.0-enable-gnomeshortcuts.patch
+# up to git on 20110628
+Patch2: audacious-2.5.2-git20110628.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -99,6 +101,7 @@ api_min=$(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION_MIN' src/audacious/plugin.h |
 [ "${api_min}" == "%{aud_plugin_api_min}" ] || exit -1
 
 %patch1 -p1 -b .enable-gnomeshortcuts
+%patch2 -p1 -b .git-20110628
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -196,6 +199,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Wed Jun 29 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.2-3
+- Merge some post-2.5.2 fixes from git.
+
 * Fri Jun 24 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.2-2
 - Rename also the built-in desktop file path.