Compare commits

...

No commits in common. 'cs10' and 'i10c-beta' have entirely different histories.

2
.gitignore vendored

@ -1 +1 @@
SOURCES/qtserialbus-everywhere-src-6.8.1.tar.xz SOURCES/qtserialbus-everywhere-src-6.7.1.tar.xz

@ -1 +1 @@
13c431d69d810a72a23bf1f8d1de4c2705f35141 SOURCES/qtserialbus-everywhere-src-6.8.1.tar.xz c4f6efc381fd85f7c6aa7302ac2c075fee6c6406 SOURCES/qtserialbus-everywhere-src-6.7.1.tar.xz

@ -12,8 +12,8 @@
Summary: Qt6 - SerialBus component Summary: Qt6 - SerialBus component
Name: qt6-%{qt_module} Name: qt6-%{qt_module}
Version: 6.8.1 Version: 6.7.1
Release: 2%{?dist} Release: 4%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io Url: http://www.qt.io
@ -90,13 +90,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%qt6_dont_autoinstall_tests %qt6_dont_autoinstall_tests
%endif %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 %cmake_install
%if 0%{?build_tests} %if 0%{?build_tests}
@ -107,7 +100,6 @@ sed -i -e 's@.*qt_sbom/SPDXRef-Package-qtserialbus-qt-plugin-TestCanBusPlugin.cm
%files %files
%license LICENSES/* %license LICENSES/*
%{_qt6_archdatadir}/sbom/%{qt_module}-%{qt_version}.spdx
%{_qt6_libdir}/libQt6SerialBus.so.6* %{_qt6_libdir}/libQt6SerialBus.so.6*
%{_qt6_bindir}/canbusutil %{_qt6_bindir}/canbusutil
%{_qt6_plugindir}/canbus %{_qt6_plugindir}/canbus
@ -135,17 +127,8 @@ sed -i -e 's@.*qt_sbom/SPDXRef-Package-qtserialbus-qt-plugin-TestCanBusPlugin.cm
%endif %endif
%changelog %changelog
* Tue Dec 10 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-2 * Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 6.7.1-4
- Re-enable tests - Rebuilt for MSVSphere 10
Resolves: RHEL-53982
* Fri Dec 06 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-1
- 6.8.1
Resolves: RHEL-53982
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 6.7.1-5
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.7.1-4 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.7.1-4
- Bump release for June 2024 mass rebuild - Bump release for June 2024 mass rebuild

Loading…
Cancel
Save