From 718efb16c967bd606d4a54d7dacf4d18bdad3d10 Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Fri, 20 Dec 2024 13:43:25 +0300
Subject: [PATCH] import qt6-qtpositioning-6.8.1-2.el10

---
 .gitignore                   |  2 +-
 .qt6-qtpositioning.metadata  |  2 +-
 SPECS/qt6-qtpositioning.spec | 24 ++++++++++++++++++++++--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index f26c1ca..3a95ec1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/qtpositioning-everywhere-src-6.7.1.tar.xz
+SOURCES/qtpositioning-everywhere-src-6.8.1.tar.xz
diff --git a/.qt6-qtpositioning.metadata b/.qt6-qtpositioning.metadata
index 35c19a6..2af6bde 100644
--- a/.qt6-qtpositioning.metadata
+++ b/.qt6-qtpositioning.metadata
@@ -1 +1 @@
-7e8768a226a80a1d2c43a554dec323dbc6ec9633 SOURCES/qtpositioning-everywhere-src-6.7.1.tar.xz
+2dd73da6104512ff2b7c9f49e9dbe10367908dde SOURCES/qtpositioning-everywhere-src-6.8.1.tar.xz
diff --git a/SPECS/qt6-qtpositioning.spec b/SPECS/qt6-qtpositioning.spec
index 322ddb7..73fb5f5 100644
--- a/SPECS/qt6-qtpositioning.spec
+++ b/SPECS/qt6-qtpositioning.spec
@@ -12,8 +12,8 @@
 
 Summary: Qt6 - Positioning 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
@@ -109,6 +109,17 @@ 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-qtpositioning-qt-plugin-QGeoPositionInfoSourceFactoryTestPlugin.cmake")@@' \
+       -e 's@.*qt_sbom/SPDXRef-PackagedFile-qt-plugin-QGeoPositionInfoSourceFactoryTestPlugin.cmake")@@' \
+       -e 's@.*qt_sbom/SPDXRef-Package-qtpositioning-qt-plugin-DummyPluginForTestsFactoryPlugin.cmake")@@' \
+       -e 's@.*qt_sbom/SPDXRef-PackagedFile-qt-plugin-DummyPluginForTestsFactoryPlugin.cmake")@@' \
+       -e 's@.*qt_sbom/SPDXRef-Package-qtpositioning-qt-plugin-QGeoSatelliteInfoSourceTestPlugin.cmake")@@' \
+       -e 's@.*qt_sbom/SPDXRef-PackagedFile-qt-plugin-QGeoSatelliteInfoSourceTestPlugin.cmake")@@' \
+       %_vpath_srcdir/%_vpath_builddir/qt_sbom/assemble_sbom.cmake
+%endif
+
 %cmake_install
 
 %if 0%{?build_tests}
@@ -132,6 +143,7 @@ popd
 
 %files
 %license LICENSES/GPL* LICENSES/LGPL*
+%{_qt6_archdatadir}/sbom/%{qt_module}-%{qt_version}.spdx
 %{_qt6_libdir}/libQt6Positioning.so.6*
 %dir %{_qt6_archdatadir}/qml/QtPositioning
 %{_qt6_archdatadir}/qml/QtPositioning/*
@@ -169,6 +181,14 @@ popd
 %endif
 
 %changelog
+* Mon Dec 09 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-2
+- Re-enable tests
+  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