From 6c9d0f7f92771b64470c71c6ec0358d2423d451d Mon Sep 17 00:00:00 2001
From: Brendan Jones <brendan.jones.it@gmail.com>
Date: Mar 19 2014 09:04:17 +0000
Subject: Update to 1.2.0


---

diff --git a/.gitignore b/.gitignore
index b652445..ba4af38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /yoshimi-0.060.12.tar.bz2
 /yoshimi-1.0.0.tar.bz2
 /yoshimi-1.1.0.tar.bz2
+/yoshimi-1.2.0.tar.bz2
diff --git a/sources b/sources
index eb06479..8a8efb7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b51d0f12a3cd5a52f5e334e5d88982a  yoshimi-1.1.0.tar.bz2
+e3219d2aa36c156b79d1cc8c0cbd694f  yoshimi-1.2.0.tar.bz2
diff --git a/yoshimi-1.2.0-Wformat-security.patch b/yoshimi-1.2.0-Wformat-security.patch
new file mode 100644
index 0000000..2bf62bf
--- /dev/null
+++ b/yoshimi-1.2.0-Wformat-security.patch
@@ -0,0 +1,16 @@
+diff -Nurp yoshimi-1.2.0/src/UI/MasterUI.fl yoshimi-1.2.0.mod/src/UI/MasterUI.fl
+--- yoshimi-1.2.0/src/UI/MasterUI.fl	2014-03-16 18:01:06.000000000 +0100
++++ yoshimi-1.2.0.mod/src/UI/MasterUI.fl	2014-03-19 09:48:48.305437197 +0100
+@@ -880,10 +880,10 @@ ZynAddSubFX}
+             if (result == -10)
+             {
+                 msg += ",\\nit does not appear to be a valid parameter file.";
+-                fl_alert(msg.c_str());
++                fl_alert("%s",msg.c_str());
+             }
+             else
+-                fl_alert(msg.c_str());
++                fl_alert("%s",msg.c_str());
+         }} {}
+   }
+   Function {do_save_master(const char* file = NULL)} {} {
diff --git a/yoshimi-cflags.patch b/yoshimi-cflags.patch
deleted file mode 100644
index 8e566e8..0000000
--- a/yoshimi-cflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- yoshimi-1.1.0/src/CMakeLists.txt.orig	2013-08-01 12:31:46.462258115 +0100
-+++ yoshimi-1.1.0/src/CMakeLists.txt	2013-08-01 12:33:14.031325525 +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"
-+  ${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"
-+  ${CMAKE_C_FLAGS}
-   CACHE STRING "X86_64 compiler options"
- )
- 
- set (BuildOptionsBasic
--    "-O3 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer"
--    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 ce68b4e..ca92bed 100644
--- a/yoshimi.spec
+++ b/yoshimi.spec
@@ -1,6 +1,6 @@
 Name:		yoshimi
-Version:	1.1.0
-Release:	4%{?dist}
+Version:	1.2.0
+Release:	1%{?dist}
 Summary:	Rewrite of ZynAddSubFx aiming for better JACK support
 
 Group:		Applications/Multimedia
@@ -8,7 +8,7 @@ License:	GPLv2+
 URL:		http://sourceforge.net/projects/%{name}
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:	%{name}.desktop
-Patch0:		yoshimi-cflags.patch
+Patch0:     %{name}-1.2.0-Wformat-security.patch
 
 BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:	cmake 
@@ -37,7 +37,8 @@ effects like Reverb, Echo, Chorus, Phaser...
 
 %prep
 %setup -q
-%patch0 -p1 -b .cflags
+sed -i -e 's|\-O3|%{optflags}|' src/CMakeLists.txt
+%patch0 -p1
 
 %build
 cd src
@@ -81,7 +82,7 @@ fi
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor.scalable/apps &>/dev/null || :
 
 %files
-%doc 1.1.0.notes COPYING
+%doc 1.2.0.notes COPYING
 %{_bindir}/%{name}
 %{_datadir}/%{name}/banks/
 %{_datadir}/applications/%{name}.desktop
@@ -90,6 +91,9 @@ fi
 %{_datadir}/%{name}/presets/
 
 %changelog
+* Wed Mar 19 2014 Brendan Jones <brendan.jones.it@gmail.com> 1.2.0-1
+- Update to 1.2.0
+
 * Thu Aug  1 2013 Peter Robinson <pbrobinson@fedoraproject.org> 1.1.0-4
 - Use distro optflags rather than random project flags to fix FTBFS on ARM
 - Modernise spec