|
|
|
|
@ -1,4 +1,3 @@
|
|
|
|
|
|
|
|
|
|
%global qt_module qttools
|
|
|
|
|
|
|
|
|
|
#global unstable 1
|
|
|
|
|
@ -7,10 +6,13 @@
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%global examples 1
|
|
|
|
|
%global build_tests 1
|
|
|
|
|
# disable once Qt7 is stable and providing the apps
|
|
|
|
|
%global metainfo 1
|
|
|
|
|
|
|
|
|
|
Summary: Qt6 - QtTool components
|
|
|
|
|
Name: qt6-qttools
|
|
|
|
|
Version: 6.6.2
|
|
|
|
|
Version: 6.8.1
|
|
|
|
|
Release: 2%{?dist}
|
|
|
|
|
|
|
|
|
|
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
|
|
|
|
@ -38,11 +40,17 @@ Source21: designer.desktop
|
|
|
|
|
Source22: linguist.desktop
|
|
|
|
|
Source23: qdbusviewer.desktop
|
|
|
|
|
|
|
|
|
|
# borrowed from Flathub with adjustments for Fedora
|
|
|
|
|
Source31: io.qt.Designer.metainfo.xml
|
|
|
|
|
Source32: io.qt.Linguist.metainfo.xml
|
|
|
|
|
Source33: io.qt.qdbusviewer.metainfo.xml
|
|
|
|
|
|
|
|
|
|
BuildRequires: gcc-c++
|
|
|
|
|
BuildRequires: cmake
|
|
|
|
|
BuildRequires: ninja-build
|
|
|
|
|
BuildRequires: desktop-file-utils
|
|
|
|
|
BuildRequires: /usr/bin/file
|
|
|
|
|
BuildRequires: libappstream-glib
|
|
|
|
|
BuildRequires: qt6-rpm-macros >= %{version}
|
|
|
|
|
BuildRequires: qt6-qtbase-private-devel
|
|
|
|
|
BuildRequires: qt6-qtbase-static >= %{version}
|
|
|
|
|
@ -92,6 +100,7 @@ Requires: %{name}-common = %{version}-%{release}
|
|
|
|
|
%package libs-designercomponents
|
|
|
|
|
Summary: Qt6 Designer Components runtime library
|
|
|
|
|
Requires: %{name}-common = %{version}-%{release}
|
|
|
|
|
Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
|
|
|
|
|
%description libs-designercomponents
|
|
|
|
|
%{summary}.
|
|
|
|
|
|
|
|
|
|
@ -104,6 +113,7 @@ Requires: %{name}-common = %{version}-%{release}
|
|
|
|
|
%package -n qt6-assistant
|
|
|
|
|
Summary: Documentation browser for Qt6
|
|
|
|
|
Requires: %{name}-common = %{version}-%{release}
|
|
|
|
|
Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
|
|
|
|
|
%description -n qt6-assistant
|
|
|
|
|
%{summary}.
|
|
|
|
|
|
|
|
|
|
@ -114,17 +124,9 @@ 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}%{?_isa} = %{version}-%{release}
|
|
|
|
|
Requires: %{name}-common = %{version}-%{release}
|
|
|
|
|
%description -n qt6-linguist
|
|
|
|
|
Tools to add translations to Qt6 applications.
|
|
|
|
|
@ -139,40 +141,73 @@ and invoke methods on those objects.
|
|
|
|
|
|
|
|
|
|
%package -n qt6-doctools
|
|
|
|
|
Summary: Qt6 doc tools package
|
|
|
|
|
Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
|
|
|
|
|
%description -n qt6-doctools
|
|
|
|
|
%{summary}.
|
|
|
|
|
|
|
|
|
|
%if 0%{?examples}
|
|
|
|
|
%package examples
|
|
|
|
|
Summary: Programming examples for %{name}
|
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
Requires: %{name}-common = %{version}-%{release}
|
|
|
|
|
Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
|
|
|
|
|
%description examples
|
|
|
|
|
%{summary}.
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if 0%{?build_tests}
|
|
|
|
|
%package tests
|
|
|
|
|
Summary: Unit tests for %{name}
|
|
|
|
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
|
|
|
|
Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
|
|
|
|
|
%description tests
|
|
|
|
|
%{summary}.
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%setup -q -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}}
|
|
|
|
|
|
|
|
|
|
%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_qt6 \
|
|
|
|
|
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples: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
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%cmake_build
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
|
%if 0%{?build_tests}
|
|
|
|
|
%qt6_dont_autoinstall_tests
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%cmake_install
|
|
|
|
|
|
|
|
|
|
%if 0%{?build_tests}
|
|
|
|
|
%qt6_install_tests
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# Add desktop files, --vendor=... helps avoid possible conflicts with qt3/qt4
|
|
|
|
|
desktop-file-install \
|
|
|
|
|
--dir=%{buildroot}%{_datadir}/applications \
|
|
|
|
|
--vendor="qt6" \
|
|
|
|
|
%{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23}
|
|
|
|
|
|
|
|
|
|
%if 0%{?metainfo}
|
|
|
|
|
install -Dm0644 -t %{buildroot}%{_metainfodir} \
|
|
|
|
|
%{SOURCE31} %{SOURCE32} %{SOURCE33}
|
|
|
|
|
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.xml
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# icons
|
|
|
|
|
install -m644 -p -D src/assistant/assistant/images/assistant.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/assistant-qt6.png
|
|
|
|
|
install -m644 -p -D src/assistant/assistant/images/assistant-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/assistant-qt6.png
|
|
|
|
|
@ -232,6 +267,7 @@ popd
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%files
|
|
|
|
|
%{_qt6_archdatadir}/sbom/%{qt_module}-%{qt_version}.spdx
|
|
|
|
|
%{_bindir}/qdbus-qt6
|
|
|
|
|
%{_qt6_bindir}/qdbus
|
|
|
|
|
%{_qt6_bindir}/qdbus-qt6
|
|
|
|
|
@ -240,20 +276,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*
|
|
|
|
|
|
|
|
|
|
@ -271,6 +301,9 @@ popd
|
|
|
|
|
%{_qt6_bindir}/qdistancefieldgenerator*
|
|
|
|
|
%{_qt6_libexecdir}/qhelpgenerator*
|
|
|
|
|
%{_qt6_libexecdir}/qtattributionsscanner*
|
|
|
|
|
%if 0%{?metainfo}
|
|
|
|
|
%{_metainfodir}/io.qt.Designer.metainfo.xml
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%files -n qt6-designer
|
|
|
|
|
%{_bindir}/designer*
|
|
|
|
|
@ -278,12 +311,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*
|
|
|
|
|
@ -302,12 +329,18 @@ popd
|
|
|
|
|
%{_qt6_libexecdir}/lprodump*
|
|
|
|
|
%{_qt6_libexecdir}/lrelease*
|
|
|
|
|
%{_qt6_libexecdir}/lupdate*
|
|
|
|
|
%if 0%{?metainfo}
|
|
|
|
|
%{_metainfodir}/io.qt.Linguist.metainfo.xml
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%files -n qt6-qdbusviewer
|
|
|
|
|
%{_bindir}/qdbusviewer*
|
|
|
|
|
%{_qt6_bindir}/qdbusviewer*
|
|
|
|
|
%{_datadir}/applications/*qdbusviewer.desktop
|
|
|
|
|
%{_datadir}/icons/hicolor/*/apps/qdbusviewer*.*
|
|
|
|
|
%if 0%{?metainfo}
|
|
|
|
|
%{_metainfodir}/io.qt.qdbusviewer.metainfo.xml
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%files devel
|
|
|
|
|
%{_bindir}/pixeltool*
|
|
|
|
|
@ -317,8 +350,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/
|
|
|
|
|
@ -353,17 +386,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
|
|
|
|
|
@ -380,16 +410,60 @@ popd
|
|
|
|
|
%if 0%{?examples}
|
|
|
|
|
%files examples
|
|
|
|
|
%{_qt6_examplesdir}/
|
|
|
|
|
%dir %{_qt6_libdir}/cmake/Qt6Designer
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if 0%{?build_tests}
|
|
|
|
|
%files tests
|
|
|
|
|
%{_qt6_archdatadir}/tests
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Tue Nov 26 2024 Troy Dawson <tdawson@redhat.com> - 6.6.2-2
|
|
|
|
|
- Rebuild for LLVM18
|
|
|
|
|
* Wed Dec 18 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 6.8.1-2
|
|
|
|
|
- Rebuilt for MSVSphere 10
|
|
|
|
|
|
|
|
|
|
* Wed Dec 11 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-2
|
|
|
|
|
- Add versioned deps to -examples
|
|
|
|
|
Resolves: RHEL-53982
|
|
|
|
|
|
|
|
|
|
* Fri Dec 06 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-1
|
|
|
|
|
- 6.8.1
|
|
|
|
|
Resolves: RHEL-53982
|
|
|
|
|
|
|
|
|
|
* Mon Nov 04 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1 -6
|
|
|
|
|
- Fix build against LLVM 19
|
|
|
|
|
Resolves: RHEL-64941
|
|
|
|
|
|
|
|
|
|
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 6.7.1-5
|
|
|
|
|
- Bump release for October 2024 mass rebuild:
|
|
|
|
|
Resolves: RHEL-64018
|
|
|
|
|
|
|
|
|
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.7.1-4
|
|
|
|
|
- Bump release for June 2024 mass rebuild
|
|
|
|
|
|
|
|
|
|
* Thu Jun 06 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-3
|
|
|
|
|
- Fix unit tests (rebuild for qt6-macros)
|
|
|
|
|
Resolves: RHEL-35968
|
|
|
|
|
|
|
|
|
|
* Tue Jun 04 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-2
|
|
|
|
|
- Add rpminspect.yaml and fix dependencies
|
|
|
|
|
Resolves: RHEL-36430
|
|
|
|
|
|
|
|
|
|
* Fri May 31 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-1
|
|
|
|
|
- 6.7.1
|
|
|
|
|
Resolves: RHEL-36430
|
|
|
|
|
|
|
|
|
|
* Thu May 09 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-2
|
|
|
|
|
- Rebuild (LLVM-18)
|
|
|
|
|
Resolves: RHEL-27730
|
|
|
|
|
|
|
|
|
|
* Fri Apr 19 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-1
|
|
|
|
|
- 6.7.0
|
|
|
|
|
Resolves: RHEL-27845
|
|
|
|
|
Resolves: RHEL-31169
|
|
|
|
|
|
|
|
|
|
* Thu Feb 15 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.2-1
|
|
|
|
|
- 6.6.2
|
|
|
|
|
* 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
|
|
|
|
|
|
|
|
|
|
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.1-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
