diff --git a/.gitignore b/.gitignore index 2d69208..6cf15d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtserialbus-everywhere-src-6.7.1.tar.xz +SOURCES/qtserialbus-everywhere-src-6.8.1.tar.xz diff --git a/.qt6-qtserialbus.metadata b/.qt6-qtserialbus.metadata index f36f01d..6bb8c04 100644 --- a/.qt6-qtserialbus.metadata +++ b/.qt6-qtserialbus.metadata @@ -1 +1 @@ -c4f6efc381fd85f7c6aa7302ac2c075fee6c6406 SOURCES/qtserialbus-everywhere-src-6.7.1.tar.xz +13c431d69d810a72a23bf1f8d1de4c2705f35141 SOURCES/qtserialbus-everywhere-src-6.8.1.tar.xz diff --git a/SPECS/qt6-qtserialbus.spec b/SPECS/qt6-qtserialbus.spec index 56497ab..ab0a0ff 100644 --- a/SPECS/qt6-qtserialbus.spec +++ b/SPECS/qt6-qtserialbus.spec @@ -12,8 +12,8 @@ Summary: Qt6 - SerialBus component Name: qt6-%{qt_module} -Version: 6.7.1 -Release: 5%{?dist} +Version: 6.8.1 +Release: 2%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io @@ -90,6 +90,13 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %qt6_dont_autoinstall_tests %endif +%if 0%{?build_tests} +# FIXME: avoid SBOM for test plugins +sed -i -e 's@.*qt_sbom/SPDXRef-Package-qtserialbus-qt-plugin-TestCanBusPlugin.cmake")@@' \ + -e 's@.*qt_sbom/SPDXRef-PackagedFile-qt-plugin-TestCanBusPlugin.cmake")@@' \ + %_vpath_srcdir/%_vpath_builddir/qt_sbom/assemble_sbom.cmake +%endif + %cmake_install %if 0%{?build_tests} @@ -100,6 +107,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %files %license LICENSES/* +%{_qt6_archdatadir}/sbom/%{qt_module}-%{qt_version}.spdx %{_qt6_libdir}/libQt6SerialBus.so.6* %{_qt6_bindir}/canbusutil %{_qt6_plugindir}/canbus @@ -127,6 +135,14 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %endif %changelog +* Tue Dec 10 2024 Jan Grulich - 6.8.1-2 +- Re-enable tests + Resolves: RHEL-53982 + +* Fri Dec 06 2024 Jan Grulich - 6.8.1-1 +- 6.8.1 + Resolves: RHEL-53982 + * Tue Oct 29 2024 Troy Dawson - 6.7.1-5 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018