From 6aa30ec012e55bc04b047d32849c186bb02e8f4d Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 3 Dec 2024 09:59:12 +0100 Subject: [PATCH] Do not install ExamplesAssetDownloader Resolves: RHEL-53982 --- qt6-qtbase.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index eefe549..75d2f47 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -47,7 +47,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components Version: 6.8.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://qt-project.org/ @@ -523,6 +523,12 @@ install -m 644 src/plugins/platforms/xcb/*.h %{buildroot}%{_qt6_headerdir}/QtXcb rm %{buildroot}/%{_qt6_libexecdir}/qt-cmake-private-install.cmake +rm -r %{buildroot}%{_qt6_libdir}/cmake/Qt6ExamplesAssetDownloaderPrivate +rm -r %{buildroot}%{_qt6_headerdir}/QtExamplesAssetDownloader +rm %{buildroot}%{_qt6_libdir}/qt6/modules/ExamplesAssetDownloaderPrivate.json +rm %{buildroot}%{_qt6_libdir}/libQt6ExamplesAssetDownloader.* +rm %{buildroot}%{_qt6_libdir}/qt6/metatypes/qt6examplesassetdownloaderprivate_*_metatypes.json + # Use better location for some new scripts in qtbase-6.0.1 mv %{buildroot}/%{_qt6_libexecdir}/ensure_pro_file.cmake %{buildroot}/%{_qt6_libdir}/cmake/Qt6/ensure_pro_file.cmake @@ -602,7 +608,6 @@ make check -k ||: %dir %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate %dir %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate %dir %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate -%dir %{_qt6_libdir}/cmake/Qt6ExamplesAssetDownloaderPrivate %dir %{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate %dir %{_qt6_libdir}/cmake/Qt6FbSupportPrivate %dir %{_qt6_libdir}/cmake/Qt6Gui @@ -659,7 +664,6 @@ make check -k ||: %{_qt6_headerdir}/QtDBus/ %{_qt6_headerdir}/QtInputSupport %{_qt6_headerdir}/QtExampleIcons -%{_qt6_headerdir}/QtExamplesAssetDownloader %{_qt6_headerdir}/QtGui/ %{_qt6_headerdir}/QtNetwork/ %{_qt6_headerdir}/QtOpenGL/ @@ -742,7 +746,6 @@ make check -k ||: %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate/*.cmake -%{_qt6_libdir}/cmake/Qt6ExamplesAssetDownloaderPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6FbSupportPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6Gui/*.cmake %{_qt6_libdir}/cmake/Qt6GuiTools/*.cmake @@ -781,8 +784,6 @@ make check -k ||: %{_qt6_libdir}/libQt6DeviceDiscoverySupport.prl %{_qt6_libdir}/libQt6ExampleIcons.a %{_qt6_libdir}/libQt6ExampleIcons.prl -%{_qt6_libdir}/libQt6ExamplesAssetDownloader.a -%{_qt6_libdir}/libQt6ExamplesAssetDownloader.prl %{_qt6_headerdir}/QtFbSupport %{_qt6_libdir}/libQt6FbSupport.*a %{_qt6_libdir}/libQt6FbSupport.prl @@ -877,6 +878,10 @@ make check -k ||: %endif %changelog +* Tue Dec 03 2024 Jan Grulich - 6.8.1-2 +- Do not install ExamplesAssetDownloader + Resolves: RHEL-53982 + * Mon Dec 02 2024 Jan Grulich - 6.8.1-1 - 6.8.1 Resolves: RHEL-4218