Compare commits

..

No commits in common. 'c10-beta' and 'epel9' have entirely different histories.

27
.gitignore vendored

@ -1 +1,26 @@
SOURCES/qttools-everywhere-src-6.7.1.tar.xz /qttools-everywhere-src-6.0.0.tar.xz
/qttools-everywhere-src-6.0.1.tar.xz
/qttools-everywhere-src-6.0.3.tar.xz
/qttools-everywhere-src-6.1.0.tar.xz
/qttools-everywhere-src-6.1.1.tar.xz
/qttools-everywhere-src-6.1.2.tar.xz
/qttools-everywhere-src-6.2.0-beta4.tar.xz
/qttools-everywhere-src-6.2.0-rc.tar.xz
/qttools-everywhere-src-6.2.0-rc2.tar.xz
/qttools-everywhere-src-6.2.0.tar.xz
/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
/qttools-everywhere-src-6.3.1.tar.xz
/qttools-everywhere-src-6.4.0.tar.xz
/qttools-everywhere-src-6.4.1.tar.xz
/qttools-everywhere-src-6.4.2.tar.xz
/qttools-everywhere-src-6.4.3.tar.xz
/qttools-everywhere-src-6.5.0.tar.xz
/qttools-everywhere-src-6.5.1.tar.xz
/qttools-everywhere-src-6.5.2.tar.xz
/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.6.2.tar.xz

@ -1 +0,0 @@
3cc4b77444190293ba0b9a7895d779f7ef3e2f49 SOURCES/qttools-everywhere-src-6.7.1.tar.xz

@ -1,3 +1,4 @@
%global qt_module qttools %global qt_module qttools
#global unstable 1 #global unstable 1
@ -6,12 +7,11 @@
%endif %endif
%global examples 1 %global examples 1
%global build_tests 1
Summary: Qt6 - QtTool components Summary: Qt6 - QtTool components
Name: qt6-qttools Name: qt6-qttools
Version: 6.7.1 Version: 6.6.2
Release: 4%{?dist} Release: 2%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io Url: http://www.qt.io
@ -92,7 +92,6 @@ Requires: %{name}-common = %{version}-%{release}
%package libs-designercomponents %package libs-designercomponents
Summary: Qt6 Designer Components runtime library Summary: Qt6 Designer Components runtime library
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
%description libs-designercomponents %description libs-designercomponents
%{summary}. %{summary}.
@ -105,7 +104,6 @@ Requires: %{name}-common = %{version}-%{release}
%package -n qt6-assistant %package -n qt6-assistant
Summary: Documentation browser for Qt6 Summary: Documentation browser for Qt6
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
%description -n qt6-assistant %description -n qt6-assistant
%{summary}. %{summary}.
@ -116,9 +114,17 @@ Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release}
%description -n qt6-designer %description -n qt6-designer
%{summary}. %{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 %package -n qt6-linguist
Summary: Qt6 Linguist Tools Summary: Qt6 Linguist Tools
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
%description -n qt6-linguist %description -n qt6-linguist
Tools to add translations to Qt6 applications. Tools to add translations to Qt6 applications.
@ -133,7 +139,6 @@ and invoke methods on those objects.
%package -n qt6-doctools %package -n qt6-doctools
Summary: Qt6 doc tools package Summary: Qt6 doc tools package
Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
%description -n qt6-doctools %description -n qt6-doctools
%{summary}. %{summary}.
@ -141,20 +146,10 @@ Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
%package examples %package examples
Summary: Programming examples for %{name} Summary: Programming examples for %{name}
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
%description examples %description examples
%{summary}. %{summary}.
%endif %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 %prep
%setup -q -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} %setup -q -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}}
@ -164,29 +159,14 @@ Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
%endif %endif
%build %build
%cmake_qt6 \ %cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF}
-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 %cmake_build
%install %install
%if 0%{?build_tests}
%qt6_dont_autoinstall_tests
%endif
%cmake_install %cmake_install
%if 0%{?build_tests}
%qt6_install_tests
%endif
# Add desktop files, --vendor=... helps avoid possible conflicts with qt3/qt4 # Add desktop files, --vendor=... helps avoid possible conflicts with qt3/qt4
desktop-file-install \ desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications \ --dir=%{buildroot}%{_datadir}/applications \
@ -260,14 +240,20 @@ popd
%files common %files common
%license LICENSES/LGPL* %license LICENSES/LGPL*
%ldconfig_scriptlets libs-designer
%files libs-designer %files libs-designer
%{_qt6_libdir}/libQt6Designer.so.6* %{_qt6_libdir}/libQt6Designer.so.6*
%dir %{_qt6_libdir}/cmake/Qt6Designer/ %dir %{_qt6_libdir}/cmake/Qt6Designer/
%{_qt6_plugindir}/designer/* %{_qt6_plugindir}/designer/*
%ldconfig_scriptlets libs-designercomponents
%files libs-designercomponents %files libs-designercomponents
%{_qt6_libdir}/libQt6DesignerComponents.so.6* %{_qt6_libdir}/libQt6DesignerComponents.so.6*
%ldconfig_scriptlets libs-help
%files libs-help %files libs-help
%{_qt6_libdir}/libQt6Help.so.6* %{_qt6_libdir}/libQt6Help.so.6*
@ -292,6 +278,12 @@ popd
%{_datadir}/applications/*designer.desktop %{_datadir}/applications/*designer.desktop
%{_datadir}/icons/hicolor/*/apps/designer*.* %{_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 %files -n qt6-linguist
%{_bindir}/linguist* %{_bindir}/linguist*
@ -325,8 +317,8 @@ popd
%{_qt6_bindir}/qtdiag* %{_qt6_bindir}/qtdiag*
%{_qt6_bindir}/qtplugininfo* %{_qt6_bindir}/qtplugininfo*
%{_qt6_headerdir}/QtQDocCatch/ %{_qt6_headerdir}/QtQDocCatch/
%{_qt6_headerdir}/QtQDocCatchConversions/ %{_qt6_headerdir}/QtQDocCatchConversionsPrivate/
%{_qt6_headerdir}/QtQDocCatchGenerators/ %{_qt6_headerdir}/QtQDocCatchGeneratorsPrivate/
%{_qt6_headerdir}/QtDesigner/ %{_qt6_headerdir}/QtDesigner/
%{_qt6_headerdir}/QtDesignerComponents/ %{_qt6_headerdir}/QtDesignerComponents/
%{_qt6_headerdir}/QtHelp/ %{_qt6_headerdir}/QtHelp/
@ -338,7 +330,6 @@ popd
%{_qt6_libdir}/libQt6UiTools.so %{_qt6_libdir}/libQt6UiTools.so
%{_qt6_libdir}/cmake/Qt6/FindWrapLibClang.cmake %{_qt6_libdir}/cmake/Qt6/FindWrapLibClang.cmake
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtToolsTestsConfig.cmake %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtToolsTestsConfig.cmake
%dir %{_qt6_libdir}/cmake/Qt6Designer
%{_qt6_libdir}/cmake/Qt6Designer/*.cmake %{_qt6_libdir}/cmake/Qt6Designer/*.cmake
%{_qt6_libdir}/cmake/Qt6DesignerComponentsPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6DesignerComponentsPrivate/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6QDocCatchPrivate %dir %{_qt6_libdir}/cmake/Qt6QDocCatchPrivate
@ -362,14 +353,17 @@ popd
%dir %{_qt6_libdir}/cmake/Qt6LinguistTools %dir %{_qt6_libdir}/cmake/Qt6LinguistTools
%{_qt6_libdir}/cmake/Qt6UiTools/ %{_qt6_libdir}/cmake/Qt6UiTools/
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatch_private.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatch_private.pri
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatchconversions_private.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatchconversionsprivate.pri
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatchgenerators_private.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_designer.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_designer.pri
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_designer_private.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_designercomponents_private.pri
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_help.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_help.pri
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_help_private.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.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_tools_private.pri
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_uiplugin.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_uiplugin.pri
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_uitools.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_uitools.pri
@ -386,41 +380,16 @@ popd
%if 0%{?examples} %if 0%{?examples}
%files examples %files examples
%{_qt6_examplesdir}/ %{_qt6_examplesdir}/
%dir %{_qt6_libdir}/cmake/Qt6Designer
%endif %endif
%if 0%{?build_tests}
%files tests
%{_qt6_archdatadir}/tests
%endif
%changelog %changelog
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.7.1-4 * Tue Nov 26 2024 Troy Dawson <tdawson@redhat.com> - 6.6.2-2
- Bump release for June 2024 mass rebuild - Rebuild for LLVM18
* 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
* Wed Mar 27 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-3 * Thu Feb 15 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.2-1
- Add -tests subpackage with unit tests that can run in CI - 6.6.2
Resolves: RHEL-28239
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.1-2 * Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

@ -0,0 +1 @@
SHA512 (qttools-everywhere-src-6.6.2.tar.xz) = bf8d7fc92768b2a4992cef021576b1a6ed1405995ab18113db22c72f9e159b38012ff98d797b2a9578cc82527dc51fae92605a5e6a94fdeecd7e0da95509ce90
Loading…
Cancel
Save