From 5d0420f1e9007de403d292634968ebc42a03c41c Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 21 Apr 2022 09:20:27 +0200 Subject: [PATCH 1/9] 6.3.0 --- .gitignore | 1 + qt6-qttools.spec | 21 +++++++++++++-------- sources | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b5c2c6e..3c59371 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /qttools-everywhere-src-6.2.1.tar.xz /qttools-everywhere-src-6.2.2.tar.xz /qttools-everywhere-src-6.2.3.tar.xz +/qttools-everywhere-src-6.3.0.tar.xz diff --git a/qt6-qttools.spec b/qt6-qttools.spec index 7757111..dc2a7c3 100644 --- a/qt6-qttools.spec +++ b/qt6-qttools.spec @@ -6,10 +6,12 @@ %global prerelease rc2 %endif +#global examples 1 + Summary: Qt6 - QtTool components Name: qt6-qttools -Version: 6.2.3 -Release: 2%{?dist} +Version: 6.3.0 +Release: 1%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -140,12 +142,13 @@ Summary: Qt6 doc tools package %description -n qt6-doctools %{summary}. +%if 0%{?examples} %package examples Summary: Programming examples for %{name} Requires: %{name}-common = %{version}-%{release} %description examples %{summary}. - +%endif %prep %setup -q -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} @@ -157,7 +160,7 @@ Requires: %{name}-common = %{version}-%{release} %build -%cmake_qt6 +%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} %cmake_build @@ -243,6 +246,7 @@ popd %files libs-designer %{_qt6_libdir}/libQt6Designer.so.6* %dir %{_qt6_libdir}/cmake/Qt6Designer/ +%{_qt6_plugindir}/designer/* %ldconfig_scriptlets libs-designercomponents @@ -265,9 +269,8 @@ popd %{_bindir}/qdoc* %{_qt6_bindir}/qdoc* %{_bindir}/qdistancefieldgenerator* -%{_bindir}/qhelpgenerator* %{_qt6_bindir}/qdistancefieldgenerator* -%{_qt6_bindir}/qhelpgenerator* +%{_qt6_libexecdir}/qhelpgenerator* %{_qt6_libexecdir}/qtattributionsscanner* %files -n qt6-designer @@ -361,15 +364,17 @@ popd %{_qt6_archdatadir}/mkspecs/modules/qt_lib_uitools.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_uitools_private.pri -%if ! 0%{?no_examples:1} +%if 0%{?examples} %files examples %{_qt6_examplesdir}/ -%{_qt6_plugindir}/designer/* %dir %{_qt6_libdir}/cmake/Qt6Designer %endif %changelog +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + * Fri Feb 25 2022 Jan Grulich - 6.2.3-2 - Enable s390x builds diff --git a/sources b/sources index debf658..0415ddf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qttools-everywhere-src-6.2.3.tar.xz) = f783d6d74e534b5ab4e9bec7f40c8a08d8e7e7405bc9926060002938518194d0cda55c1d2f35f3d766142c277107b8caaba484b472d571b0752477d0c53c6552 +SHA512 (qttools-everywhere-src-6.3.0.tar.xz) = 027db897817811f8e8003551ed95d4078311b6324284dd3d4149e636227c57a3b7fc0ebf9bc2b7d381c10080deb89074bcc198d54e15ecef73a7cf41e8ecdb1e From 21099502e006b1a7ad19aaa9c74a929b1290e9fc Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 25 May 2022 09:11:54 +0200 Subject: [PATCH 2/9] Enable examples --- qt6-qttools.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qt6-qttools.spec b/qt6-qttools.spec index dc2a7c3..b384e87 100644 --- a/qt6-qttools.spec +++ b/qt6-qttools.spec @@ -6,12 +6,12 @@ %global prerelease rc2 %endif -#global examples 1 +%global examples 1 Summary: Qt6 - QtTool components Name: qt6-qttools Version: 6.3.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -146,6 +146,7 @@ Summary: Qt6 doc tools package %package examples Summary: Programming examples for %{name} Requires: %{name}-common = %{version}-%{release} +BuildRequires: qt6-qttools-devel %description examples %{summary}. %endif @@ -372,6 +373,9 @@ popd %changelog +* Wed May 25 2022 Jan Grulich - 6.3.0-2 +- Enable examples + * Wed Apr 13 2022 Jan Grulich - 6.3.0-1 - 6.3.0 From 3ba9d6790243eebe6bfc56502bb01d86288c8d96 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 25 May 2022 09:26:34 +0200 Subject: [PATCH 3/9] -examples: require same version of our devel package --- qt6-qttools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt6-qttools.spec b/qt6-qttools.spec index b384e87..540ffdc 100644 --- a/qt6-qttools.spec +++ b/qt6-qttools.spec @@ -145,8 +145,8 @@ Summary: Qt6 doc tools package %if 0%{?examples} %package examples Summary: Programming examples for %{name} +BuildRequires: qt6-qttools-devel >= %{version} Requires: %{name}-common = %{version}-%{release} -BuildRequires: qt6-qttools-devel %description examples %{summary}. %endif From 0f66a38786860f3b639aaec26451996e97c3ac5f Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 25 May 2022 09:59:15 +0200 Subject: [PATCH 4/9] Move files to correct subpackages --- qt6-qttools.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qt6-qttools.spec b/qt6-qttools.spec index 540ffdc..fec6a2c 100644 --- a/qt6-qttools.spec +++ b/qt6-qttools.spec @@ -322,11 +322,10 @@ popd %{_qt6_headerdir}/QtDesignerComponents/ %{_qt6_headerdir}/QtHelp/ %{_qt6_headerdir}/QtUiPlugin +%{_qt6_headerdir}/QtUiTools/ %{_qt6_headerdir}/QtTools/ %{_qt6_datadir}/modules/*.json -%{_qt6_libdir}/libQt6Designer*.prl %{_qt6_libdir}/libQt6Designer*.so -%{_qt6_libdir}/libQt6Help.prl %{_qt6_libdir}/libQt6Help.so %{_qt6_libdir}/libQt6UiTools.so %{_qt6_libdir}/cmake/Qt6/FindWrapLibClang.cmake @@ -346,6 +345,7 @@ popd %dir %{_qt6_libdir}/cmake/Qt6ToolsTools/ %{_qt6_libdir}/cmake/Qt6ToolsTools/*.cmake %dir %{_qt6_libdir}/cmake/Qt6LinguistTools +%{_qt6_libdir}/cmake/Qt6UiTools/ %{_qt6_archdatadir}/mkspecs/modules/qt_lib_designer.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_designer_private.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_designercomponents_private.pri @@ -355,15 +355,15 @@ popd %{_qt6_archdatadir}/mkspecs/modules/qt_lib_linguist_private.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_tools_private.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_uiplugin.pri +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_uitools.pri +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_uitools_private.pri %{_qt6_libdir}/metatypes/qt6*_metatypes.json %files static -%{_qt6_headerdir}/QtUiTools/ +%{_qt6_libdir}/libQt6Designer*.prl +%{_qt6_libdir}/libQt6Help.prl %{_qt6_libdir}/libQt6UiTools.prl -%{_qt6_libdir}/cmake/Qt6UiTools/ -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_uitools.pri -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_uitools_private.pri %if 0%{?examples} %files examples From 4bf079a32d7cb62d1ca9c9a5939e547a23b88092 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 25 May 2022 10:38:09 +0200 Subject: [PATCH 5/9] -examples: require -static subpkg --- qt6-qttools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qt6-qttools.spec b/qt6-qttools.spec index fec6a2c..468e9f9 100644 --- a/qt6-qttools.spec +++ b/qt6-qttools.spec @@ -146,6 +146,7 @@ Summary: Qt6 doc tools package %package examples Summary: Programming examples for %{name} BuildRequires: qt6-qttools-devel >= %{version} +BuildRequires: qt6-qttools-static >= %{version} Requires: %{name}-common = %{version}-%{release} %description examples %{summary}. From bef3ec51b2146f8b90a5e239d87a1f139aa3d712 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 25 May 2022 13:42:10 +0200 Subject: [PATCH 6/9] Fix path to lprodump --- qt6-qttools.spec | 5 ++++- qttools-run-qttools-with-qt6-suffix.patch | 12 ------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/qt6-qttools.spec b/qt6-qttools.spec index 468e9f9..c769d5a 100644 --- a/qt6-qttools.spec +++ b/qt6-qttools.spec @@ -11,7 +11,7 @@ Summary: Qt6 - QtTool components Name: qt6-qttools Version: 6.3.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -374,6 +374,9 @@ popd %changelog +* Wed May 25 2022 Jan Grulich - 6.3.0-3 +- Fix path to lprodump + * Wed May 25 2022 Jan Grulich - 6.3.0-2 - Enable examples diff --git a/qttools-run-qttools-with-qt6-suffix.patch b/qttools-run-qttools-with-qt6-suffix.patch index d450270..4f67c5e 100644 --- a/qttools-run-qttools-with-qt6-suffix.patch +++ b/qttools-run-qttools-with-qt6-suffix.patch @@ -22,15 +22,3 @@ index 1910467..160b421 100644 + runQtTool(QStringLiteral("lupdate-qt6"), lupdateOptions); return 0; } -diff --git a/src/linguist/shared/runqttool.cpp b/src/linguist/shared/runqttool.cpp -index caf1e41..7d854cc 100644 ---- a/src/linguist/shared/runqttool.cpp -+++ b/src/linguist/shared/runqttool.cpp -@@ -119,6 +119,6 @@ std::unique_ptr createProjectDescription(QStringList args) - } - file->close(); - args << QStringLiteral("-out") << file->fileName(); -- runInternalQtTool(QStringLiteral("lprodump"), args); -+ runInternalQtTool(QStringLiteral("lprodump-qt6"), args); - return file; - } From 10cca03f423863dfc804ccfd0a541ab89dd24935 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 14 Jul 2022 09:06:12 +0200 Subject: [PATCH 7/9] 6.3.1 --- .gitignore | 1 + qt6-qttools.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3c59371..3bedaae 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /qttools-everywhere-src-6.2.2.tar.xz /qttools-everywhere-src-6.2.3.tar.xz /qttools-everywhere-src-6.3.0.tar.xz +/qttools-everywhere-src-6.3.1.tar.xz diff --git a/qt6-qttools.spec b/qt6-qttools.spec index c769d5a..d967eb4 100644 --- a/qt6-qttools.spec +++ b/qt6-qttools.spec @@ -10,8 +10,8 @@ Summary: Qt6 - QtTool components Name: qt6-qttools -Version: 6.3.0 -Release: 3%{?dist} +Version: 6.3.1 +Release: 1%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -145,8 +145,8 @@ Summary: Qt6 doc tools package %if 0%{?examples} %package examples Summary: Programming examples for %{name} -BuildRequires: qt6-qttools-devel >= %{version} -BuildRequires: qt6-qttools-static >= %{version} +# BuildRequires: qt6-qttools-devel >= %{version} +# BuildRequires: qt6-qttools-static >= %{version} Requires: %{name}-common = %{version}-%{release} %description examples %{summary}. @@ -374,6 +374,9 @@ popd %changelog +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + * Wed May 25 2022 Jan Grulich - 6.3.0-3 - Fix path to lprodump diff --git a/sources b/sources index 0415ddf..14ec1d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qttools-everywhere-src-6.3.0.tar.xz) = 027db897817811f8e8003551ed95d4078311b6324284dd3d4149e636227c57a3b7fc0ebf9bc2b7d381c10080deb89074bcc198d54e15ecef73a7cf41e8ecdb1e +SHA512 (qttools-everywhere-src-6.3.1.tar.xz) = 6e392ef2415b14119d0c4058efa78f1a66e91c01c8f48a2f1926df43f7f1cb8fcd94f84c91fc0188baa96e3055eede6f080ca4e9f150e263c3fdc5c864649883 From aeaa6b96926cca2b8870e43bef7b78d1a571939e Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 14 Jul 2022 09:36:01 +0200 Subject: [PATCH 8/9] Add pkgconfig files --- qt6-qttools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt6-qttools.spec b/qt6-qttools.spec index d967eb4..1ff5e0d 100644 --- a/qt6-qttools.spec +++ b/qt6-qttools.spec @@ -359,7 +359,7 @@ popd %{_qt6_archdatadir}/mkspecs/modules/qt_lib_uitools.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_uitools_private.pri %{_qt6_libdir}/metatypes/qt6*_metatypes.json - +%{_qt6_libdir}/pkgconfig/*.pc %files static %{_qt6_libdir}/libQt6Designer*.prl From 7b4246767be7fea8f1cfc0dd6beb902c1c0409ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 00:14:22 +0000 Subject: [PATCH 9/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt6-qttools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt6-qttools.spec b/qt6-qttools.spec index 1ff5e0d..92c6ddc 100644 --- a/qt6-qttools.spec +++ b/qt6-qttools.spec @@ -11,7 +11,7 @@ Summary: Qt6 - QtTool components Name: qt6-qttools Version: 6.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -374,6 +374,9 @@ popd %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jul 13 2022 Jan Grulich - 6.3.1-1 - 6.3.1