import qt6-qtlocation-6.8.1-1.el10

.gitignore

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

.qt6-qtlocation.metadata

@@ -1 +1 @@
-bb5ae4730e3775e456dd9ddc5176f7210f14adf6 SOURCES/qtlocation-everywhere-src-6.7.1.tar.xz
+76028dca3126e8b79c56f17820a426cef8072da0 SOURCES/qtlocation-everywhere-src-6.8.1.tar.xz

SPECS/qt6-qtlocation.spec

@@ -11,8 +11,8 @@
 
 Summary: Qt6 - Location Libraries
 Name:    qt6-%{qt_module}
-Version: 6.7.1
+Version: 6.8.1
-Release: 3%{?dist}
+Release: 1%{?dist}
 
 # Rest of the licenses are for Qt code in src/location and src/plugins
 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
@@ -95,6 +95,21 @@ 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-qtlocation-qt-plugin-TestGeoServicePlugin.cmake")@@' \
+       -e 's@.*qt_sbom/SPDXRef-PackagedFile-qt-plugin-TestGeoServicePlugin.cmake")@@' \
+       -e 's@.*qt_sbom/SPDXRef-Package-qtlocation-qt-plugin-GeocodingTestGeoServicePlugin.cmake")@@' \
+       -e 's@.*qt_sbom/SPDXRef-PackagedFile-qt-plugin-GeocodingTestGeoServicePlugin.cmake")@@' \
+       -e 's@.*qt_sbom/SPDXRef-Package-qtlocation-qt-plugin-RoutingTestGeoServicePlugin.cmake")@@' \
+       -e 's@.*qt_sbom/SPDXRef-PackagedFile-qt-plugin-RoutingTestGeoServicePlugin.cmake")@@' \
+       -e 's@.*qt_sbom/SPDXRef-Package-qtlocation-qt-plugin-UnsupportedPlacesGeoServicePlugin.cmake")@@' \
+       -e 's@.*qt_sbom/SPDXRef-PackagedFile-qt-plugin-UnsupportedPlacesGeoServicePlugin.cmake")@@' \
+       -e 's@.*qt_sbom/SPDXRef-Package-qtlocation-qt-plugin-declarative-location-test.cmake")@@' \
+       -e 's@.*qt_sbom/SPDXRef-PackagedFile-qt-plugin-declarative-location-test.cmake")@@' \
+       %_vpath_srcdir/%_vpath_builddir/qt_sbom/assemble_sbom.cmake
+%endif
+
 %cmake_install
 
 %if 0%{?build_tests}
@@ -116,6 +131,7 @@ popd
 
 %files
 %license LICENSES/GPL* LICENSES/LGPL*
+%{_qt6_archdatadir}/sbom/%{qt_module}-%{qt_version}.spdx
 %{_qt6_libdir}/libQt6Location.so.6*
 %dir %{_qt6_archdatadir}/qml/QtLocation
 %{_qt6_archdatadir}/qml/QtLocation/*
@@ -146,6 +162,14 @@ popd
 %endif
 
 %changelog
+* 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-4
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
 * Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 6.7.1-3
 - Rebuilt for MSVSphere 10