Resolves: RHEL-27845
Resolves: RHEL-31169
This commit is contained in:
Jan Grulich 2024-04-19 12:56:55 +02:00
parent 4a8ad6deaf
commit 0bc9186544
3 changed files with 15 additions and 33 deletions

1
.gitignore vendored
View File

@ -23,3 +23,4 @@
/qttools-everywhere-src-6.5.3.tar.xz
/qttools-everywhere-src-6.6.0.tar.xz
/qttools-everywhere-src-6.6.1.tar.xz
/qttools-everywhere-src-6.7.0.tar.xz

View File

@ -1,4 +1,3 @@
%global qt_module qttools
#global unstable 1
@ -11,8 +10,8 @@
Summary: Qt6 - QtTool components
Name: qt6-qttools
Version: 6.6.1
Release: 3%{?dist}
Version: 6.7.0
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -115,15 +114,6 @@ Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release}
%description -n qt6-designer
%{summary}.
%if 0%{?webkit}
%package -n qt6-designer-plugin-webkit
Summary: Qt6 designer plugin for WebKit
BuildRequires: pkgconfig(Qt6WebKitWidgets)
Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
%description -n qt6-designer-plugin-webkit
%{summary}.
%endif
%package -n qt6-linguist
Summary: Qt6 Linguist Tools
Requires: %{name}-common = %{version}-%{release}
@ -171,7 +161,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
-DQT_BUILD_TESTS=%{?build_tests:ON}%{!?build_tests:OFF}
-DQT_BUILD_TESTS=%{?build_tests:ON}%{!?build_tests:OFF} \
-DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF}
%if 0%{?build_tests}
%qt6_fix_tests
@ -264,20 +255,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*
@ -302,12 +287,6 @@ popd
%{_datadir}/applications/*designer.desktop
%{_datadir}/icons/hicolor/*/apps/designer*.*
%if 0%{?webkit}
%files -n qt6-designer-plugin-webkit
%{_qt6_plugindir}/designer/libqwebview.so
%{_qt6_libdir}/cmake/Qt6Designer/Qt6Designer_QWebViewPlugin.cmake
%endif
%files -n qt6-linguist
%{_bindir}/linguist*
@ -341,8 +320,8 @@ popd
%{_qt6_bindir}/qtdiag*
%{_qt6_bindir}/qtplugininfo*
%{_qt6_headerdir}/QtQDocCatch/
%{_qt6_headerdir}/QtQDocCatchConversionsPrivate/
%{_qt6_headerdir}/QtQDocCatchGeneratorsPrivate/
%{_qt6_headerdir}/QtQDocCatchConversions/
%{_qt6_headerdir}/QtQDocCatchGenerators/
%{_qt6_headerdir}/QtDesigner/
%{_qt6_headerdir}/QtDesignerComponents/
%{_qt6_headerdir}/QtHelp/
@ -378,17 +357,14 @@ popd
%dir %{_qt6_libdir}/cmake/Qt6LinguistTools
%{_qt6_libdir}/cmake/Qt6UiTools/
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatch_private.pri
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatchconversionsprivate.pri
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatchconversionsprivate_private.pri
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatchgeneratorsprivate.pri
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatchgeneratorsprivate_private.pri
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatchconversions_private.pri
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatchgenerators_private.pri
%{_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
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_help.pri
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_help_private.pri
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_linguist.pri
%{_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
@ -413,6 +389,11 @@ popd
%endif
%changelog
* Fri Apr 19 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-1
- 6.7.0
Resolves: RHEL-27845
Resolves: RHEL-31169
* Wed Mar 27 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-3
- Add -tests subpackage with unit tests that can run in CI
Resolves: RHEL-28239

View File

@ -1 +1 @@
SHA512 (qttools-everywhere-src-6.6.1.tar.xz) = 7f7bfaf7f01a5374f711c20113e9461b83a6f908b48c7b3f662f8821a70ef0c792f040f2e8e62a570fec06df2329fe5eb953c680424262b3678ab283045e6909
SHA512 (qttools-everywhere-src-6.7.0.tar.xz) = 8d478568d8e7ffc40af8099e95f2b37913c05490cc127d559c13ed3cba75bf8cca06ad3afce65649186a3e52442f8e0f820a2ac6b655ec0e2b808e6df834d560