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