From 7043e09a6edb9ca147bf22b408df02202f1b9a6d Mon Sep 17 00:00:00 2001
From: Adam Huffman <bloch@verdurin.com>
Date: Sep 05 2019 22:10:22 +0000
Subject: Update to upstream release 1.6.0 and revert to upstream CMakeLists


---

diff --git a/.gitignore b/.gitignore
index d93e7cc..158b953 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
 /yoshimi-1.5.8.2.tar.bz2
 /yoshimi-1.5.9.tar.bz2
 /yoshimi-1.5.10.tar.bz2
+/yoshimi-1.6.0.tar.bz2
diff --git a/sources b/sources
index 32c0918..1727889 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (yoshimi-1.5.10.tar.bz2) = 1d6371f1d82438dc8b65fdb21b0460d998616c4a27bcee4f3e450542eb346eeb87e59a9448ef210fa45a119efdfc3d6dd7a6acd20ef3ad5a29d982f218704d48
+SHA512 (yoshimi-1.6.0.tar.bz2) = 7d2dcc53f5955d07ebb7171a151878764c19e755d8b472fef1efa239466286c473d2c9059327c346cfeae2f79793ae1b94cc4fa4c33ebd7680cfd683f41f61e7
diff --git a/yoshimi.spec b/yoshimi.spec
index 449a0e8..057cccc 100644
--- a/yoshimi.spec
+++ b/yoshimi.spec
@@ -1,13 +1,12 @@
 Name:		yoshimi
-Version:	1.5.10
-Release:	4%{?dist}
+Version:	1.6.0
+Release:	1%{?dist}
 Summary:	Rewrite of ZynAddSubFx aiming for better JACK support
 
 License:	GPLv2+
 URL:		http://sourceforge.net/projects/%{name}
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:	%{name}.desktop
-Source2:	CMakeLists.txt
 Patch0:		%{name}-cflags.patch
 
 BuildRequires:  gcc-c++
@@ -40,7 +39,6 @@ effects like Reverb, Echo, Chorus, Phaser...
 
 %prep
 %setup -q
-cp %{SOURCE2} src/
 %patch0 -p1
 
 %build
@@ -67,7 +65,7 @@ chmod 755 %{buildroot}%{_datadir}/%{name}/banks/*
 chmod 755 %{buildroot}%{_datadir}/%{name}/presets
 chmod 755 %{buildroot}%{_datadir}/%{name}/presets/*
 
-rm %{buildroot}%{_datadir}/doc/%{name}/yoshimi-user-manual-1.5.10.pdf
+rm %{buildroot}%{_datadir}/doc/%{name}/yoshimi-user-manual-1.6.0.pdf
 
 %files
 %doc Changelog COPYING README.txt doc/* 
@@ -85,6 +83,9 @@ rm %{buildroot}%{_datadir}/doc/%{name}/yoshimi-user-manual-1.5.10.pdf
 %{_mandir}/man1/yoshimi.1*
 
 %changelog
+* Thu Sep 05 2019 Adam Huffman <bloch@verdurin.com> - 1.6.0-1
+- Update to upstream release 1.6.0
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild