[rpms/yoshimi] rawhide: - update to 2.3.6.1 fixes rhbz#1933807 rhbz#2381649

[rpms/yoshimi] rawhide: - update to 2.3.6.1 fixes rhbz#1933807 rhbz#2381649

[Filipe Rosset]

            A new commit has been pushed.

            Repo   : rpms/yoshimi
            Branch : rawhide
            Commit : 32c9935710539208cd067302f4949b32f8158164
            Author : Filipe Rosset <filiperosset@fedoraproject.org>
            Date   : 2026-06-29T17:10:45-03:00
            Stats  : +39/-31 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/yoshimi/c/32c9935710539208cd067302f4949b32f8158164?branch=rawhide

            Log:
            - update to 2.3.6.1 fixes rhbz#1933807 rhbz#2381649
- Switched to HTTPS for URL and Source0, consolidated patches
- Use macros in %%prep, %%cmake macros, honor build flags

Signed-off-by: Filipe Rosset <filiperosset@fedoraproject.org>

---
diff --git a/.gitignore b/.gitignore
index d9a70cb..79bf008 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,4 @@
 /yoshimi-2.2.1.tar.bz2
 /yoshimi-2.2.3.tar.bz2
 /yoshimi-2.3.0.tar.bz2
+/yoshimi-2.3.6.1.tar.bz2

diff --git a/sources b/sources
index e005ab0..2d144f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (yoshimi-2.3.0.tar.bz2) = 41fe5dc89582586224593f9ae0f6216e752618e4d43e369285dadeb0c57da96b0168e4752a0c2014aac1dcb77df46a921dc1fd9698f99101d95cb61c5bed0dc1
+SHA512 (yoshimi-2.3.6.1.tar.bz2) = 00b43a7653cff0ef2988d6a1407c762184d5b87914cacd2befdba32f8d63acdb16cbafcd89bfc48631a3677bae3eb0ec30d822d2ec7aa264940f0302dd57d35b

diff --git a/yoshimi.spec b/yoshimi.spec
index f55ef71..9b9bfc8 100644
--- a/yoshimi.spec
+++ b/yoshimi.spec
@@ -1,18 +1,16 @@
 %global _vpath_srcdir src
 
 Name:		yoshimi
-Version:	2.3.0
-Release:	9%{?dist}
+Version:	2.3.6.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
-URL:		http://sourceforge.net/projects/%{name}
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Source1:	%{name}.desktop
+URL:		https://sourceforge.net/projects/%{name}
+Source0:	https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-cflags.patch
 
-BuildRequires:  gcc-c++
+BuildRequires:	gcc-c++
 BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:	cmake 
 BuildRequires:	zlib-devel 
@@ -27,8 +25,9 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	boost-devel
 BuildRequires:	mesa-libGL-devel
 BuildRequires:	cairo-devel
-BuildRequires:  lv2-devel
-BuildRequires:  readline-devel
+BuildRequires:	lv2-devel
+BuildRequires:	readline-devel
+BuildRequires:	libappstream-glib
 
 %description
 
@@ -41,49 +40,57 @@ made by it sound like those from professional keyboards. The program has
 effects like Reverb, Echo, Chorus, Phaser...
 
 %prep
-%setup -q
-%patch 0 -p1
+%autosetup -p1 -n home/will/%{name}-%{version}
+sed -i '/<icon/d' desktop/metainfo/yoshimi.metainfo.xml
+
 
 %build
-export CFLAGS="%{optflags}"
-%cmake -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -fPIC" -DFLTK_INCLUDE_DIR=%{_includedir}/Fl
+export CMAKE_POLICY_VERSION_MINIMUM=3.5
+%cmake -DFLTK_INCLUDE_DIR=%{_includedir}/Fl
 %cmake_build
 
 
 %install
 %cmake_install
 
-mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
+# Remove duplicate examples directory from doc folder
+rm -rf %{buildroot}%{_datadir}/doc/%{name}/examples
+
+# Copy main documentation files to the doc directory
+cp -p Changelog README.md %{buildroot}%{_datadir}/doc/%{name}/
 
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
-install -m 644 desktop/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
+# Fix directory and file permissions
+find %{buildroot}%{_datadir}/%{name} -type d -exec chmod 0755 {} +
+find %{buildroot}%{_datadir}/%{name} -type f -exec chmod 0644 {} +
+find %{buildroot}%{_datadir}/doc/%{name} -type d -exec chmod 0755 {} +
+find %{buildroot}%{_datadir}/doc/%{name} -type f -exec chmod 0644 {} +
 
-# 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}/doc/%{name}/yoshimi-user-manual-2.0.pdf
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metainfo.xml
+
 
 %files
-%doc Changelog COPYING README.txt doc/* 
+%license COPYING
+%doc %{_docdir}/%{name}/
 %{_bindir}/%{name}
-%{_datadir}/%{name}/banks/
+%{_datadir}/%{name}/
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/scalable/apps/%{name}.png
 %{_datadir}/pixmaps/%{name}.png
-%{_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/
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_metainfodir}/%{name}.metainfo.xml
 %{_libdir}/lv2/%{name}.lv2/
 %{_mandir}/man1/yoshimi.1*
 
 %changelog
+* Mon Jun 29 2026 Filipe Rosset <filiperosset@fedoraproject.org> - 2.3.6.1-1
+- update to 2.3.6.1 fixes rhbz#1933807 rhbz#2381649
+- Switched to HTTPS for URL and Source0, consolidated patches
+- Use macros in %%prep, %%cmake macros, honor build flags
+
 * Sat Jan 24 2026 Richard Shaw <hobbes1069@gmail.com> - 2.3.0-9
 - Rebuild with fltk 1.3 compat package.