From 362927c9c8f555b0804cc8d26bbe3cb7beb1f9f6 Mon Sep 17 00:00:00 2001
From: Adam Huffman <bloch@verdurin.com>
Date: Sep 30 2017 06:46:39 +0000
Subject: Update to latest upstream release 1.5.4


---

diff --git a/.gitignore b/.gitignore
index a0ebfba..583d4ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@
 /yoshimi-1.5.2.tar.bz2
 /yoshimi-1.5.2.1.tar.bz2
 /yoshimi-1.5.3.tar.bz2
+/yoshimi-1.5.4.tar.bz2
+/yoshimi.appdata.xml
diff --git a/sources b/sources
index 3611f04..2bcaa9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (yoshimi-1.5.3.tar.bz2) = 4520e70fe8d905a0b3a13f3feb68414277f808ad010b4d914b1e3549b9922eaaacde754e6b246a7e645d3b8e6585ab235e8d3b9097b0782d2be757272c65ee05
+SHA512 (yoshimi-1.5.4.tar.bz2) = bfde437422b480ecf49a8b839b357b4710668be9b6d54bde92bd1802bb0dec1022a2aaed1f80f3cdfa4e8a493f302661f81d89ade89ffc21b478dfbcbef13a9b
diff --git a/yoshimi.spec b/yoshimi.spec
index 3cc05a8..b4ec94a 100644
--- a/yoshimi.spec
+++ b/yoshimi.spec
@@ -1,5 +1,5 @@
 Name:		yoshimi
-Version:	1.5.3
+Version:	1.5.4
 Release:	1%{?dist}
 Summary:	Rewrite of ZynAddSubFx aiming for better JACK support
 
@@ -9,7 +9,6 @@ URL:		http://sourceforge.net/projects/%{name}
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:	%{name}.desktop
 Patch0:		%{name}-cflags.patch
-#Patch1:		%{name}-gcc6.patch
 
 BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:	cmake 
@@ -41,7 +40,6 @@ effects like Reverb, Echo, Chorus, Phaser...
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
 
 %build
 cd src
@@ -60,15 +58,13 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
 install -m 644 ../desktop/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
 
-#Remove superfluous file
-#rm %{buildroot}%{_datadir}/%{name}/banks/chip/.bankdir
-
 # Fix directory permissions without affecting patch files
 chmod 755 %{buildroot}%{_datadir}/%{name}/banks
 chmod 755 %{buildroot}%{_datadir}/%{name}/banks/*
 chmod 755 %{buildroot}%{_datadir}/%{name}/presets
 chmod 755 %{buildroot}%{_datadir}/%{name}/presets/*
 
+rm %{buildroot}%{_datadir}/%{name}/yoshimi-user-manual.pdf
 
 %post
 update-desktop-database -q
@@ -84,8 +80,9 @@ fi
 %posttrans
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor.scalable/apps &>/dev/null || :
 
+
 %files
-%doc Changelog COPYING README.txt doc/*
+%doc Changelog COPYING README.txt doc/* yoshimi-user-manual.pdf
 %{_bindir}/%{name}
 %{_datadir}/%{name}/banks/
 %{_datadir}/applications/%{name}.desktop
@@ -94,12 +91,15 @@ fi
 %{_datadir}/%{name}/presets/
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_datadir}/icons/hicolor/scalable/apps/%{name}_alt.svg
-%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/metainfo/%{name}.appdata.xml
 %{_datadir}/%{name}/examples/
 %{_libdir}/lv2/%{name}.lv2/
 %{_mandir}/man1/yoshimi.1*
 
 %changelog
+* Fri Sep 29 2017 Adam Huffman <bloch@verdurin.com> - 1.5.4-1
+- Update to upstream release 1.5.4
+
 * Fri Sep 22 2017 Adam Huffman <bloch@verdurin.com> - 1.5.3-1
 - Update to upstream release 1.5.3