From 0b4e27ea364096e848c5ee2d8dfeb169034f238a Mon Sep 17 00:00:00 2001
From: Orcan Ogetbil <oget.fedora@gmail.com>
Date: Aug 13 2011 20:52:43 +0000
Subject: Update to 1.1.4


---

diff --git a/.gitignore b/.gitignore
index 98f9481..8c243cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 fluidsynth-1.1.1.tar.gz
 /fluidsynth-1.1.2.tar.bz2
 /fluidsynth-1.1.3.tar.bz2
+/fluidsynth-1.1.4.tar.bz2
diff --git a/fluidsynth-no-abi-break.patch b/fluidsynth-no-abi-break.patch
new file mode 100644
index 0000000..f1a2ecd
--- /dev/null
+++ b/fluidsynth-no-abi-break.patch
@@ -0,0 +1,15 @@
+Index: trunk/fluidsynth/src/sfloader/fluid_defsfont.c
+===================================================================
+--- trunk/fluidsynth/src/sfloader/fluid_defsfont.c (revision 410)
++++ trunk/fluidsynth/src/sfloader/fluid_defsfont.c (revision 428)
+@@ -108,4 +108,10 @@
+ {
+   return fluid_defsfont_get_name((fluid_defsfont_t*) sfont->data);
++}
++
++fluid_sample_t* fluid_defsfont_get_sample(fluid_defsfont_t* sfont, char *s)
++{
++  /* This function is here just to avoid an ABI/SONAME bump, see ticket #98. Should never be used. */
++  return NULL;
+ }
+ 
diff --git a/fluidsynth.spec b/fluidsynth.spec
index 32927ec..2915fd4 100644
--- a/fluidsynth.spec
+++ b/fluidsynth.spec
@@ -1,9 +1,13 @@
 Summary:      Real-time software synthesizer
 Name:         fluidsynth
-Version:      1.1.3
-Release:      2%{?dist}
+Version:      1.1.4
+Release:      1%{?dist}
 URL:          http://www.fluidsynth.org/
 Source0:      http://downloads.sourceforge.net/fluidsynth/fluidsynth-%{version}.tar.bz2
+# Upstream accidentally removed a symbol from the library which breaks the ABI.
+# They reincluded it in the trunk to prevent a soname bump
+# https://sourceforge.net/apps/trac/fluidsynth/ticket/98
+Patch0:       fluidsynth-no-abi-break.patch
 License:      LGPLv2+
 Group:        Applications/Multimedia
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,11 +61,13 @@ for building programs that link against fluidsynth.
 
 %prep
 %setup -q
+%patch0 -p2 -b .abi.break.fix
+
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} -Denable-ladspa=on ..
+%{cmake} -Denable-ladspa=on .. -DLIB_SUFFIX=""
 popd
 
 # build fluidsynth
@@ -106,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 13 2011 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.1.4-1
+- Update to 1.1.4
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index b51afcd..98b0d40 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e35225b088eae0c2af0b78097941655  fluidsynth-1.1.3.tar.bz2
+b5fd2f8df79f31b68f06770dccb67956  fluidsynth-1.1.4.tar.bz2