[xmp] Fix undefined symbol corner-case for Audacious 3.2 API (#825937).

[Michael Schwendt]

commit 7f88a801cf1e64385311753a37bd5adcd60fce84
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Mon Jun 4 20:33:59 2012 +0200

    Fix undefined symbol corner-case for Audacious 3.2 API (#825937).

 xmp-3.4.0-audacious-3.2.patch |   29 +++++++++++++++++++++++++++++
 xmp.spec                      |    7 ++++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/xmp-3.4.0-audacious-3.2.patch b/xmp-3.4.0-audacious-3.2.patch
new file mode 100644
index 0000000..a011b54
--- /dev/null
+++ b/xmp-3.4.0-audacious-3.2.patch
@@ -0,0 +1,29 @@
+diff -Nurb --strip-trailing-cr xmp-3.4.0-orig/src/plugin/audacious3.c xmp-3.4.0/src/plugin/audacious3.c
+--- xmp-3.4.0-orig/src/plugin/audacious3.c	2012-05-29 08:44:56.000000000 +0200
++++ xmp-3.4.0/src/plugin/audacious3.c	2012-05-29 08:54:26.782843424 +0200
+@@ -250,9 +250,9 @@
+ 	xmp_get_module_info(ctx, &mi);
+ 
+ 	tuple = tuple_new_from_filename(filename);
+-	tuple_associate_string(tuple, FIELD_TITLE, NULL, mi.name);
+-	tuple_associate_string(tuple, FIELD_CODEC, NULL, mi.type);
+-	tuple_associate_int(tuple, FIELD_LENGTH, NULL, len);
++	tuple_set_str(tuple, FIELD_TITLE, NULL, mi.name);
++	tuple_set_str(tuple, FIELD_CODEC, NULL, mi.type);
++	tuple_set_int(tuple, FIELD_LENGTH, NULL, len);
+ 
+ 	xmp_release_module(ctx);
+ 	xmp_free_context(ctx);
+@@ -351,9 +351,9 @@
+ 	xmp_get_module_info(ctx, &xmp_cfg.mod_info);
+ 
+ 	tuple = tuple_new_from_filename(filename);
+-	tuple_associate_string(tuple, FIELD_TITLE, NULL, xmp_cfg.mod_info.name);
+-	tuple_associate_string(tuple, FIELD_CODEC, NULL, xmp_cfg.mod_info.type);
+-	tuple_associate_int(tuple, FIELD_LENGTH, NULL, lret);
++	tuple_set_str(tuple, FIELD_TITLE, NULL, xmp_cfg.mod_info.name);
++	tuple_set_str(tuple, FIELD_CODEC, NULL, xmp_cfg.mod_info.type);
++	tuple_set_int(tuple, FIELD_LENGTH, NULL, lret);
+ 	ipb->set_tuple(ipb, tuple);
+ 
+ 	ipb->set_params(ipb, xmp_cfg.mod_info.chn * 1000, opt->freq, channelcnt);
diff --git a/xmp.spec b/xmp.spec
index a27352c..c91a20e 100644
--- a/xmp.spec
+++ b/xmp.spec
@@ -8,7 +8,7 @@
 
 Name: xmp
 Version: 3.4.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: A multi-format module player
 Group: Applications/Multimedia
 #Source: http://downloads.sourceforge.net/sourceforge/xmp/xmp-%{version}.tar.gz
@@ -27,6 +27,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 # port to Audacious 3.1 Preferences API, albeit without connecting
 # any GUI elements with config section/name pairs directly
 Patch0: xmp-3.4.0-audacious-3.1.patch
+Patch1: xmp-3.4.0-audacious-3.2.patch
 
 %description
 The Extended Module Player is a modplayer for Unix-like systems that plays
@@ -73,6 +74,7 @@ This package contains the xmp plugin for XMMS.
 
 %setup -q
 %patch0 -p1 -b .aud-api-3.1
+%patch1 -p1 -b .aud-api-3.2
 pushd docs
 for file in ChangeLog CREDITS ; do
 	iconv -f iso8859-1 -t utf8 -o $file.utf $file && touch -r $file $file.utf && mv $file.utf $file
@@ -109,6 +111,9 @@ rm -rf %{buildroot}
 %{xmms_input_plugin_dir}/*
 
 %changelog
+* Mon Jun  4 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 3.4.0-7
+- Fix undefined symbol corner-case for Audacious 3.2 API (#825937).
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild