[fluid-soundfont] Use trysource for the gs config in timidity++.cfg (rhbz#815611)

[Hans de Goede]

commit 27cceaaa316395ccd6ecd4a5501897a426acefbc
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Apr 30 10:30:04 2012 +0200

    Use trysource for the gs config in timidity++.cfg (rhbz#815611)

 fluid-soundfont.spec |    9 ++++++---
 timidity++.cfg       |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/fluid-soundfont.spec b/fluid-soundfont.spec
index e9e6ec5..bb5d859 100644
--- a/fluid-soundfont.spec
+++ b/fluid-soundfont.spec
@@ -1,6 +1,6 @@
 Name:           fluid-soundfont
 Version:        3.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Pro-quality GM/GS soundfont
 Group:          Applications/Multimedia
 License:        MIT
@@ -51,8 +51,8 @@ Group:          Applications/Multimedia
 Requires:       %{name}-common = %{version}-%{release}
 Provides:       soundfont2
 Provides:       soundfont2-default
-# timidity++ used to provide its own timidity++.cfg
-Conflicts:      timidity++ <= 2.13.2-28
+# If timidity++ is installed it must understand the trysouce configfile keyword
+Conflicts:      timidity++ <= 2.13.2-30.cvs20111110%{?dist}
 
 %description gm
 %common_description
@@ -152,6 +152,9 @@ install -p -m 644 FluidR3.cfg $RPM_BUILD_ROOT%{_sysconfdir}/timidity.cfg
 
 
 %changelog
+* Mon Apr 30 2012 Hans de Goede <hdegoede at redhat.com> - 3.1-8
+- Use trysource for the gs config in timidity++.cfg (rhbz#815611)
+
 * Sat Jan 21 2012 Hans de Goede <hdegoede at redhat.com> - 3.1-7
 - Add timidity++.cfg files tweaked for using FluidR3 with timidity++, written
   by Saito, one of the TiMidity++ developers
diff --git a/timidity++.cfg b/timidity++.cfg
index f08163f..96c7a9a 100644
--- a/timidity++.cfg
+++ b/timidity++.cfg
@@ -1,4 +1,4 @@
 dir /usr/share/soundfonts
 source fluid3gm.cfg
-source fluid3gs.cfg
+trysource fluid3gs.cfg
 source fluid_altassign.cfg