Merge branch 'main' into f32

.gitignore

@@ -47,9 +47,3 @@
 /yoshimi-1.7.4.tar.bz2
 /yoshimi-2.0.tar.bz2
 /yoshimi-2.0.1.tar.bz2
-/yoshimi-2.0.2.tar.bz2
-/yoshimi-2.1.2.2.tar.bz2
-/yoshimi-2.2.0.tar.bz2
-/yoshimi-2.2.1.tar.bz2
-/yoshimi-2.2.3.tar.bz2
-/yoshimi-2.3.0.tar.bz2

sources

@@ -1 +1 @@
-SHA512 (yoshimi-2.3.0.tar.bz2) = 41fe5dc89582586224593f9ae0f6216e752618e4d43e369285dadeb0c57da96b0168e4752a0c2014aac1dcb77df46a921dc1fd9698f99101d95cb61c5bed0dc1
+SHA512 (yoshimi-2.0.1.tar.bz2) = f46d058adbeedd0c4e407275d6f0547ec2069b15811f27cff6d750258cd7fe443e739895b80a6cc11716cb394f09dccead03f711cdb3e1bafc183a1c181745c0

yoshimi.spec

@@ -1,12 +1,11 @@
 %global _vpath_srcdir src
 
 Name:		yoshimi
-Version:	2.3.0
-Release:	7%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 Summary:	Rewrite of ZynAddSubFx aiming for better JACK support
 
-# Automatically converted from old format: GPLv2+ - review is highly recommended.
-License:	GPL-2.0-or-later
+License:	GPLv2+
 URL:		http://sourceforge.net/projects/%{name}
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:	%{name}.desktop
@@ -37,16 +36,16 @@ the Jack Audio Connection Kit.
 
 ZynAddSubFX is an open source software synthesizer capable of making a
 countless number of instrument sounds. It is microtonal, and the instruments
-made by it sound like those from professional keyboards. The program has
+made by it sounds like those from professional keyboards. The program has
 effects like Reverb, Echo, Chorus, Phaser...
 
 %prep
 %setup -q
-%patch 0 -p1
+%patch0 -p1
 
 %build
 export CFLAGS="%{optflags}"
-%cmake -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -fPIC" -DFLTK_INCLUDE_DIR=%{_includedir}/Fl
+%cmake -S src -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -fPIC" -DFLTK_INCLUDE_DIR=%{_includedir}/Fl
 %cmake_build
 
 
@@ -65,7 +64,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-2.0.pdf
+rm %{buildroot}%{_datadir}/doc/%{name}/yoshimi-user-manual-2.0.pdf
 
 %files
 %doc Changelog COPYING README.txt doc/* 
@@ -78,60 +77,11 @@ chmod 755 %{buildroot}%{_datadir}/%{name}/presets/*
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_datadir}/icons/hicolor/scalable/apps/%{name}_alt.svg
 %{_datadir}/metainfo/%{name}.appdata.xml
-%{_datadir}/metainfo/%{name}.metainfo.xml
 %{_datadir}/%{name}/examples/
 %{_libdir}/lv2/%{name}.lv2/
 %{_mandir}/man1/yoshimi.1*
 
 %changelog
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 2.3.0-5
-- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed May 31 2023 Adam Huffman <bloch@verdurin.com> - 2.3.0-1
-- Update to upstream feature release 2.3.0
-
-* Mon Feb 13 2023 Adam Huffman <bloch@verdurin.com> - 2.2.3-1
-- Update to latest bugfix release 2.2.3
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Jul 25 2022 Adam Huffman <bloch@verdurin.com> - 2.2.1-1
-- Update to upstream feature and bugfix release 2.2.1
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sun May 22 2022 Adam Huffman <bloch@verdurin.com> - 2.2.0-1
-- Update to latest feature release
-
-* Sun Feb 13 2022 Adam Huffman <bloch@verdurin.com> - 2.1.2.2-1
-- Update to latest upstream bugfix release 
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jun 22 2021 Adam Huffman <bloch@verdurin.com> - 2.0.2-1
-- Update to upstream bugfix release 2.0.2
-
 * Sun Apr 18 2021 Adam Huffman <bloch@verdurin.com> - 2.0.1-1
 - Update to upstream bugfix release 2.0.1
 
@@ -149,6 +99,7 @@ chmod 755 %{buildroot}%{_datadir}/%{name}/presets/*
 
 * Wed Aug 19 2020 Adam Huffman <bloch@verdurin.com> - 1.7.2-1
 - Update to upstream release 1.7.2
+- Hard-code CMake to use src as builddir
 
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild