package ffado-mixer apart and fix desktop entry and icon [release 2.4.5-2mamba;Fri Jun 24 2022]

libffado.spec

@@ -1,6 +1,6 @@
 Name:          libffado
 Version:       2.4.5
-Release:       1mamba
+Release:       2mamba
 Summary:       Free Firewire Audio Drivers Library
 Group:         System/Libraries
 Vendor:        openmamba
@@ -60,6 +60,18 @@ Requires:      PyQt5
 The FFADO project aims to provide a generic, open-source solution for the support of FireWire based audio devices for the Linux platform. It is the successor of the FreeBoB project.
 This package contains applications and utilities for use with %{name}.
 
+%package -n ffado-mixer
+Group:         Graphical Desktop/Applications/Multimedia
+Summary:       ffado mixer GUI
+Requires:      ffado = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      dbus
+Requires:      python-dbus-py3
+Requires:      PyQt5
+
+%description -n ffado-mixer
+The FFADO project aims to provide a generic, open-source solution for the support of FireWire based audio devices for the Linux platform. It is the successor of the FreeBoB project.
+This package contains the ffado mixer GUI.
+
 %debug_package
 
 %prep
@@ -77,6 +89,11 @@ cp -a %{SOURCE1} .
 #   	rm -rf $s
 #done
 
+# fix icon name, so it's coherent with XDG desktop file name
+sed -e 's/hi64-apps-ffado/ffado-mixer/g' -i support/xdg/ffado.org-ffadomixer.desktop
+# fix id, so it's coherent with XDG desktop file name
+sed -e 's/ffado.org-ffadomixer.desktop/ffado-mixer.desktop/g' -i support/xdg/ffado-mixer.appdata.xml
+
 %build
 export CFLAGS="%{optflags} -ffast-math"
 export CXXFLAGS="%{optflags} -ffast-math --std=gnu++11"
@@ -99,13 +116,13 @@ scons %{?_smp_mflags} \
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
-scons DESTDIR=%{buildroot} install
+scons DESTDIR=%{buildroot} WILL_DEAL_WITH_XDG_MYSELF=True install
 
 mkdir -p %{buildroot}%{_datadir}/applications
-install -pm 644 support/xdg/ffado.org-ffadomixer.desktop %{buildroot}%{_datadir}/applications/
+install -pm 644 support/xdg/ffado.org-ffadomixer.desktop \
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps
+   %{buildroot}%{_datadir}/applications/ffado-mixer.desktop
-ln -s ../../../../libffado/icons/hi64-apps-ffado.png \
+install -D -m0644 support/xdg/hi64-apps-ffado.png \
-	%{buildroot}%{_datadir}/icons/hicolor/64x64/apps/ffado.png
+   %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/ffado-mixer.png
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -150,14 +167,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/ffado-diag
 %{_bindir}/ffado-dice-firmware
 %{_bindir}/ffado-fireworks-downloader
-%{_bindir}/ffado-mixer
 %{_bindir}/ffado-set-nickname
 %{_datadir}/libffado/*.xml
-%{_datadir}/applications/ffado.org-ffadomixer.desktop
-%{_datadir}/metainfo/ffado-mixer.appdata.xml
 %{_datadir}/dbus-1/services/org.ffado.Control.service
-%{_datadir}/icons/hicolor/64x64/apps/ffado.png
-%{_datadir}/libffado/icons/hi64-apps-ffado.png
 %dir %{python3_sitelib}/ffado
 %{python3_sitelib}/ffado/*.py*
 %{python3_sitelib}/ffado/*.ui
@@ -166,9 +178,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{python3_sitelib}/ffado/mixer/*.ui
 %dir %{python3_sitelib}/ffado/widgets
 %{python3_sitelib}/ffado/widgets/*.py*
+%{_datadir}/libffado/icons/hi64-apps-ffado.png
 %{_mandir}/man1/ffado-*.1*
 
+%files -n ffado-mixer
+%defattr(-,root,root)
+%{_bindir}/ffado-mixer
+%{_datadir}/applications/ffado-mixer.desktop
+%{_datadir}/metainfo/ffado-mixer.appdata.xml
+%{_datadir}/icons/hicolor/64x64/apps/ffado-mixer.png
+
 %changelog
+* Fri Jun 24 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 2.4.5-2mamba
+- package ffado-mixer apart and fix desktop entry and icon
+
 * Sun Feb 27 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 2.4.5-1mamba
 - update to 2.4.5