From 332b6504531a3e576b38f238a93c7bbbfc37ba35 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Wed, 20 Nov 2024 16:55:17 +0800 Subject: [PATCH] adopt to new cmake macro --- qt6-qttools.spec | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/qt6-qttools.spec b/qt6-qttools.spec index cf9b0b6..f65bd30 100644 --- a/qt6-qttools.spec +++ b/qt6-qttools.spec @@ -5,7 +5,7 @@ Summary: Qt6 - QtTool components Name: qt6-qttools Version: 6.5.2 -Release: 1 +Release: 2 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io @@ -142,19 +142,18 @@ Requires: %{name}-common = %{version}-%{release} %prep %setup -q -n %{qt_module}-everywhere-src-%{version} -%patch1 -p1 -b .run-qttools-with-qt6-suffix +%patch -P1 -p1 -b .run-qttools-with-qt6-suffix %ifarch %{mips32} -%patch2 -p1 -b .libatomic +%patch -P2 -p1 -b .libatomic %endif %build %cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} - -cmake --build . %{?_smp_mflags} --verbose +%cmake_build %install -DESTDIR="%{buildroot}" cmake --install . +%cmake_install # Add desktop files, --vendor=... helps avoid possible conflicts with qt3/qt4 desktop-file-install \ @@ -229,20 +228,14 @@ popd %files common %license LICENSES/LGPL* -%ldconfig_scriptlets libs-designer - %files libs-designer %{_qt6_libdir}/libQt6Designer.so.6* %dir %{_qt6_libdir}/cmake/Qt6Designer/ %{_qt6_plugindir}/designer/* -%ldconfig_scriptlets libs-designercomponents - %files libs-designercomponents %{_qt6_libdir}/libQt6DesignerComponents.so.6* -%ldconfig_scriptlets libs-help - %files libs-help %{_qt6_libdir}/libQt6Help.so.6* @@ -359,6 +352,9 @@ popd %changelog +* Wed Nov 20 2024 Funda Wang - 6.5.2-2 +- adopt to new cmake macro + * Thu Nov 30 2023 houhongxun - 6.5.2-1 - update to version 6.5.2 -- Gitee