diff --git a/.gitignore b/.gitignore index 749eaf7..ef73c7f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ libffado-2.0.1-svn1864.tar.bz2 /libffado-2.4.5.tgz /libffado-2.4.6.tgz /libffado-2.4.7.tgz +/libffado-2.4.8.tgz +/libffado-2.4.9.tgz diff --git a/libffado.spec b/libffado.spec index 9887eab..9788072 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,14 +1,21 @@ %if ! 0%{?rhel} || 0%{?rhel} > 8 -%global needs_scons_quirk 0 +%bcond scons_quirk 0 %else -%global needs_scons_quirk 1 +%bcond scons_quirk 1 +%endif + +%if %{without scons_quirk} +%global scons scons +%else +%global scons scons-3 %endif Summary: Free firewire audio driver library Name: libffado -Version: 2.4.7 +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,7 +31,6 @@ 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 @@ -37,11 +43,13 @@ BuildRequires: libxml++-devel BuildRequires: pkgconfig BuildRequires: python3-qt5-devel BuildRequires: python3-devel -%if ! %needs_scons_quirk +%if %{without scons_quirk} BuildRequires: python3-scons >= 3.0.2 %else BuildRequires: python3-scons %endif +BuildRequires: python3dist(setuptools) +BuildRequires: rpm_macro(py3_shebang_fix) ExcludeArch: s390 s390x @@ -52,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 @@ -63,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 @@ -75,14 +85,14 @@ Applications and utilities for use with libffado. %prep %autosetup -N -%patch0 -p1 -b .no-test-apps -%patch1 -p1 -b .icon-name -%if %needs_scons_quirk -%patch2 -p1 -b .scons-quirk +%patch -P0 -p1 -b .no-test-apps +%patch -P1 -p1 -b .icon-name +%if %{with scons_quirk} +%patch -P2 -p1 -b .scons-quirk %endif # Fix Python shebangs -sed -i 's|/usr/bin/.*python$|/usr/bin/python3|' \ +%py3_shebang_fix \ admin/*.py doc/SConscript tests/python/*.py tests/*.py \ support/mixer-qt4/ffado-mixer* support/mixer-qt4/SConscript \ support/tools/*.py support/tools/SConscript @@ -91,10 +101,10 @@ sed -i 's|/usr/bin/.*python$|/usr/bin/python3|' \ export CFLAGS="%{optflags} -ffast-math" export CXXFLAGS="%{optflags} -ffast-math --std=gnu++11" export LDFLAGS="%{build_ldflags}" -scons-3 %{?_smp_mflags} \ +%{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} \ @@ -110,30 +120,14 @@ scons-3 %{?_smp_mflags} \ export CFLAGS="%{optflags} -ffast-math" export CXXFLAGS="%{optflags} -ffast-math --std=gnu++11" export LDFLAGS="%{build_ldflags}" -scons-3 DESTDIR=%{buildroot} PREFIX=%{_prefix}\ +%{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 @@ -141,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/ @@ -155,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/ diff --git a/sources b/sources index e748454..3364280 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libffado-2.4.7.tgz) = 424a9ca7ded12e72d77a50d7ddf4e50dc0d55b80d725499df7609ce60d0eac8b24a41d9b8e4e74f78bdefe114b61bd5f1ec09a6d083f4a58475e66d61153f075 +SHA512 (libffado-2.4.9.tgz) = 0a0c61cf9339ab542c85eaefbe017b7613f716ae0ed08d11a37782dd7ef5815b18256c5d1b9240f077c9f59bbf4b4878019cefbd6cab78140477bcad6a9d3e44