rebuild for new libconfig

Signed-off-by: Nils Philippsen <nils@tiptoe.de>

.gitignore

@@ -14,3 +14,4 @@ libffado-2.0.1-svn1864.tar.bz2
 /libffado-2.4.6.tgz
 /libffado-2.4.7.tgz
 /libffado-2.4.8.tgz
+/libffado-2.4.9.tgz

libffado-2.4.7-python312-imp-removal.patch

@@ -1,69 +0,0 @@
---- libffado-2.4.7/admin/pyuic.py.orig	2023-07-13 15:54:22.683633139 +0900
-+++ libffado-2.4.7/admin/pyuic.py	2023-07-13 15:59:32.832327567 +0900
-@@ -21,7 +21,7 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #
- 
--import imp
-+import importlib.util
- 
- def pyuic_action( target, source, env ):
- 	env.Execute( "pyuic " + str( source[0] ) + " > " + str( target[0] ) )
-@@ -34,8 +34,9 @@
- 	context.Message( "Checking for pyuic (by checking for the python module pyqtconfig) " )
- 	ret = True
- 	try:
--		imp.find_module( "pyqtconfig" )
--	except ImportError:
-+		spec = importlib.util.find_spec( "pyqtconfig" )
-+		module = importlib.util.module_from_spec(spec)
-+	except AttributeError:
- 		ret = False
- 	context.Result( ret )
- 	return ret
---- libffado-2.4.7/admin/pyuic4.py.orig	2023-07-13 15:54:22.683633139 +0900
-+++ libffado-2.4.7/admin/pyuic4.py	2023-07-13 15:58:59.688360220 +0900
-@@ -21,7 +21,7 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #
- 
--import imp
-+import importlib.util
- 
- def pyuic4_action( target, source, env ):
- 	env.Execute( "pyuic4 " + str( source[0] ) + " > " + str( target[0] ) )
-@@ -34,8 +34,9 @@
- 	context.Message( "Checking for pyuic4 (by checking for the python module pyqtconfig) " )
- 	ret = True
- 	try:
--		imp.find_module( "pyqtconfig" )
--	except ImportError:
-+		spec = importlib.util.find_spec( "pyqtconfig" )
-+		module = importlib.util.module_from_spec(spec)
-+	except AttributeError:
- 		ret = False
- 	context.Result( ret )
- 	return ret
---- libffado-2.4.7/admin/pyuic5.py.orig	2023-07-13 15:54:22.683633139 +0900
-+++ libffado-2.4.7/admin/pyuic5.py	2023-07-13 15:59:27.754332570 +0900
-@@ -22,7 +22,7 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #
- 
--import imp
-+import importlib.util
- 
- def pyuic5_action( target, source, env ):
- 	env.Execute( "pyuic5 " + str( source[0] ) + " > " + str( target[0] ) )
-@@ -35,8 +35,9 @@
- 	context.Message( "Checking for pyuic5 (by checking for the python module pyqtconfig) " )
- 	ret = True
- 	try:
--		imp.find_module( "pyqtconfig" )
--	except ImportError:
-+		spec = importlib.util.find_spec( "pyqtconfig" )
-+		module = importlib.util.module_from_spec(spec)
-+	except AttributeError:
- 		ret = False
- 	context.Result( ret )
- 	return ret

libffado.spec

@@ -12,9 +12,10 @@
 
 Summary:        Free firewire audio driver library
 Name:           libffado
-Version:        2.4.8
+Version:        2.4.9
 Release:        %autorelease
-License:        GPLv2 or GPLv3
+# Automatically converted from old format: GPLv2 or GPLv3 - review is highly recommended.
+License:        GPL-2.0-only OR GPL-3.0-only
 URL:            http://www.ffado.org/
 Source0:        http://www.ffado.org/files/%{name}-%{version}.tgz
 # The trunk is tarballed as follows:
@@ -24,15 +25,12 @@ Source9:        libffado-snapshot.sh
 Patch0:         libffado-2.4.4-no-test-apps.patch
 Patch1:         libffado-2.4.4-icon-name.patch
 Patch2:         libffado-2.4.4-scons-quirk.patch
-# Patch for Python 3.12 imp module removal
-Patch3:         libffado-2.4.7-python312-imp-removal.patch
 
 BuildRequires:  alsa-lib-devel
 BuildRequires:  dbus-c++-devel
 BuildRequires:  dbus-devel
 BuildRequires:  python3-dbus
 BuildRequires:  python3-rpm-macros
-BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  glibmm24-devel
@@ -62,7 +60,8 @@ successor of the FreeBoB project.
 
 %package devel
 Summary:        Free firewire audio driver library development headers
-License:        GPLv2 or GPLv3
+# Automatically converted from old format: GPLv2 or GPLv3 - review is highly recommended.
+License:        GPL-2.0-only OR GPL-3.0-only
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
@@ -73,7 +72,8 @@ Summary:        Free firewire audio driver library applications and utilities
 # support/tools/* is GPLv3
 # Some files in support/mixer-qt4/ffado are GPLv3+
 # The rest is GPLv2 or GPLv3
-License:        GPLv3 and GPLv3+ and (GPLv2 or GPLv3)
+# Automatically converted from old format: GPLv3 and GPLv3+ and (GPLv2 or GPLv3) - review is highly recommended.
+License:        GPL-3.0-only AND GPL-3.0-or-later AND ( GPL-2.0-only OR GPL-3.0-only )
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       dbus
 Requires:       python3-dbus
@@ -84,13 +84,12 @@ Applications and utilities for use with libffado.
 
 
 %prep
-%autosetup -N -n %{name}-%{version}/libffado
+%autosetup -N
 %patch -P0 -p1 -b .no-test-apps
 %patch -P1 -p1 -b .icon-name
 %if %{with scons_quirk}
 %patch -P2 -p1 -b .scons-quirk
 %endif
-%patch -P3 -p1 -b .py312-imp-removal
 
 # Fix Python shebangs
 %py3_shebang_fix \
@@ -105,7 +104,7 @@ export LDFLAGS="%{build_ldflags}"
 %{scons} %{?_smp_mflags} \
       DETECT_USERSPACE_ENV=False \
       ENABLE_SETBUFFERSIZE_API_VER=True \
-      ENABLE_OPTIMIZATIONS=True \
+      ENABLE_OPTIMIZATIONS=False \
       CUSTOM_ENV=True \
       BUILD_DOC=user \
       PREFIX=%{_prefix} \
@@ -124,27 +123,11 @@ export LDFLAGS="%{build_ldflags}"
 %{scons} DESTDIR=%{buildroot} PREFIX=%{_prefix}\
       install
 
-# We need to install the xdg stuff manually
-mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --dir %{buildroot}%{_datadir}/applications \
-                     --add-category="Settings" \
-                     --set-icon=ffado \
-                     support/xdg/ffado.org-ffadomixer.desktop
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps
-ln -s ../../../../libffado/icons/hi64-apps-ffado.png \
-    %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/ffado.png
-
 # Install ffado-test RHBZ#805940
 install -m 755 tests/ffado-test %{buildroot}%{_bindir}
 
 %ldconfig_scriptlets
 
-%check
-desktop-file-validate \
-      %{buildroot}%{_datadir}/applications/ffado.org-ffadomixer.desktop
-appstream-util validate-relax --nonet \
-      %{buildroot}%{_datadir}/metainfo/ffado-mixer.appdata.xml
-
 %files
 %license LICENSE.*
 %doc AUTHORS ChangeLog README
@@ -152,7 +135,7 @@ appstream-util validate-relax --nonet \
 %dir %{_datadir}/libffado/
 %{_datadir}/libffado/configuration
 %{_prefix}/lib/udev/rules.d/*
-%{_libdir}/libffado/static_info.txt
+%{_libdir}/libffado
 
 %files devel
 %doc doc/reference/html/
@@ -166,9 +149,9 @@ appstream-util validate-relax --nonet \
 %{_datadir}/libffado/*.xml
 %{_datadir}/libffado/icons/
 %{_datadir}/dbus-1/services/org.ffado.Control.service
-%{_datadir}/applications/ffado.org-ffadomixer.desktop
-%{_datadir}/icons/hicolor/64x64/apps/ffado.png
-%{_datadir}/metainfo/ffado-mixer.appdata.xml
+%{_datadir}/applications/org.ffado.FfadoMixer.desktop
+%{_datadir}/icons/hicolor/64x64/apps/hi64-apps-ffado.png
+%{_datadir}/metainfo/org.ffado.FfadoMixer.metainfo.xml
 %{python3_sitelib}/ffado/
 
 

sources

@@ -1 +1 @@
-SHA512 (libffado-2.4.8.tgz) = fbbcd30640c55315f2e65fc6c07afc71a77dd2c9d1b6127ee55cd17e76511ad5f0563135e52397dbf113fb0d5925021a38780f231409bdd920da52e6c1ce3acc
+SHA512 (libffado-2.4.9.tgz) = 0a0c61cf9339ab542c85eaefbe017b7613f716ae0ed08d11a37782dd7ef5815b18256c5d1b9240f077c9f59bbf4b4878019cefbd6cab78140477bcad6a9d3e44