rpms/audacious-plugins/F-12 audacious-plugins-2.2-xspf-base.patch, NONE, 1.1 audacious-plugins.spec, 1.78, 1.79

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30594

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.2-xspf-base.patch 
Log Message:
sync with Rawhide

audacious-plugins-2.2-xspf-base.patch:
 xspf.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE audacious-plugins-2.2-xspf-base.patch ---
diff -Nur audacious-plugins-2.2-orig/src/xspf/xspf.c audacious-plugins-2.2-xspf/src/xspf/xspf.c
--- audacious-plugins-2.2-orig/src/xspf/xspf.c	2009-11-22 23:49:54.000000000 +0100
+++ audacious-plugins-2.2-xspf/src/xspf/xspf.c	2009-12-31 14:33:33.000000000 +0100
@@ -106,8 +106,8 @@
             if (!xmlStrcmp(nptr->name, (xmlChar *)"location")) {
                 /* Location is a special case */
                 gchar *str = (gchar *)xmlNodeGetContent(nptr);
-                if (!strstr(str, "://") && base)
-                    location = g_strdup_printf("%s/%s", base, str);
+                if (!strstr(str, "://") && base && str[0]!='/')
+                    location = g_strdup_printf("file://%s/%s", base, str);
                 else
                     location = g_strdup(str);
                 xmlFree(str);


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- audacious-plugins.spec	30 Dec 2009 23:40:52 -0000	1.78
+++ audacious-plugins.spec	31 Dec 2009 13:50:30 -0000	1.79
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -33,6 +33,8 @@ Patch3: audacious-plugins-2.2-cfg_db_clo
 Patch4: audacious-plugins-2.2-bluetooth.patch
 # merged upstream
 Patch5: audacious-plugins-2.2-alarm.patch
+#
+Patch6: audacious-plugins-2.2-xspf-base.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -168,6 +170,7 @@ in Vortex (.vtx) format.
 %patch3 -p1 -b .cfg_db_close
 %patch4 -p1 -b .bluetooth
 %patch5 -p1 -b .alarm
+%patch6 -p1 -b .xspf
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -262,7 +265,8 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
-* Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org>
+* Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-7
+- Fix xspf Container plugin's handling of plain file names.
 - Disable modplug plugin (where is it compared with libmodplug and
   its fixes and CVEs?). Give precedence to audacious-plugin-xmp
 - Remove BR libmodplug-devel as the modplug plugin has never used