[yoshimi] Re-add cflags patch to fix FTBFS

[Peter Robinson]

commit 2bd7ddae526748f533e80eb3ea83b89787baeb6f
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon May 19 23:19:24 2014 +0100

    Re-add cflags patch to fix FTBFS

 yoshimi-cflags.patch |   33 +++++++++++++++++++++++++++++++++
 yoshimi.spec         |   10 +++++++---
 2 files changed, 40 insertions(+), 3 deletions(-)
---
diff --git a/yoshimi-cflags.patch b/yoshimi-cflags.patch
new file mode 100644
index 0000000..df7a981
--- /dev/null
+++ b/yoshimi-cflags.patch
@@ -0,0 +1,33 @@
+--- yoshimi-1.2.0/src/CMakeLists.txt.orig	2014-05-19 22:46:20.125375737 +0100
++++ yoshimi-1.2.0/src/CMakeLists.txt	2014-05-19 22:46:30.197539167 +0100
+@@ -28,6 +28,7 @@
+     # relative paths break some scripts(?)
+ set (CMAKE_SKIP_RULE_DEPENDENCY OFF)
+     # Rebuild objects if rules have changed, even if source hasn't.
++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+ 
+ message (STATUS "Building Yoshimi version ${YOSHIMI_VERSION} for ${CMAKE_SYSTEM_NAME}")
+ 
+@@ -64,18 +65,18 @@
+ set (FifoDirectory /dev/shm CACHE STRING "Directory for fifos")
+ 
+ set (BuildOptions_x86_64AMD
+-    "-O3 -march=athlon64 -m64 -Wall -ffast-math -fno-finite-math-only -fomit-frame-pointer -ldl"
++  ${CMAKE_C_FLAGS}
+   CACHE STRING "X86_64 compiler options"
+ )
+ 
+ set (BuildOptions_X86_64Core2
+-    "-O3 -march=core2 -m64 -Wall -ffast-math -fno-finite-math-only -fomit-frame-pointer -ldl"
++  ${CMAKE_C_FLAGS}
+   CACHE STRING "X86_64 compiler options"
+ )
+ 
+ set (BuildOptionsBasic
+-    "-O3 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -ldl"
+-    CACHE STRING "basic X86 complier options"
++  ${CMAKE_C_FLAGS}
++  CACHE STRING "basic X86 complier options"
+ )
+ 
+ set (BuildOptionsDebug
diff --git a/yoshimi.spec b/yoshimi.spec
index ca92bed..2446e5e 100644
--- a/yoshimi.spec
+++ b/yoshimi.spec
@@ -1,6 +1,6 @@
 Name:		yoshimi
 Version:	1.2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Rewrite of ZynAddSubFx aiming for better JACK support
 
 Group:		Applications/Multimedia
@@ -8,7 +8,8 @@ License:	GPLv2+
 URL:		http://sourceforge.net/projects/%{name}
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:	%{name}.desktop
-Patch0:     %{name}-1.2.0-Wformat-security.patch
+Patch0:		%{name}-1.2.0-Wformat-security.patch
+Patch1:		%{name}-cflags.patch
 
 BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:	cmake 
@@ -37,8 +38,8 @@ effects like Reverb, Echo, Chorus, Phaser...
 
 %prep
 %setup -q
-sed -i -e 's|\-O3|%{optflags}|' src/CMakeLists.txt
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd src
@@ -91,6 +92,9 @@ fi
 %{_datadir}/%{name}/presets/
 
 %changelog
+* Mon May 19 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.2.0-2
+- Re-add cflags patch to fix FTBFS
+
 * Wed Mar 19 2014 Brendan Jones <brendan.jones.it at gmail.com> 1.2.0-1
 - Update to 1.2.0