Compare commits

..

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

2
.gitignore vendored

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

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

@ -11,8 +11,8 @@
Summary: Qt6 - Location Libraries Summary: Qt6 - Location Libraries
Name: qt6-%{qt_module} Name: qt6-%{qt_module}
Version: 6.8.1 Version: 6.7.1
Release: 1%{?dist} Release: 3%{?dist}
# Rest of the licenses are for Qt code in src/location and src/plugins # 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 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
@ -95,21 +95,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-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 %cmake_install
%if 0%{?build_tests} %if 0%{?build_tests}
@ -131,7 +116,6 @@ popd
%files %files
%license LICENSES/GPL* LICENSES/LGPL* %license LICENSES/GPL* LICENSES/LGPL*
%{_qt6_archdatadir}/sbom/%{qt_module}-%{qt_version}.spdx
%{_qt6_libdir}/libQt6Location.so.6* %{_qt6_libdir}/libQt6Location.so.6*
%dir %{_qt6_archdatadir}/qml/QtLocation %dir %{_qt6_archdatadir}/qml/QtLocation
%{_qt6_archdatadir}/qml/QtLocation/* %{_qt6_archdatadir}/qml/QtLocation/*
@ -162,13 +146,8 @@ popd
%endif %endif
%changelog %changelog
* Fri Dec 06 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-1 * Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 6.7.1-3
- 6.8.1 - Rebuilt for MSVSphere 10
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
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.7.1-3 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.7.1-3
- Bump release for June 2024 mass rebuild - Bump release for June 2024 mass rebuild

Loading…
Cancel
Save