Merge branch f36 into epel9
This commit is contained in:
Troy Dawson
commit
13360adf29
|
|
@ -11,3 +11,5 @@
|
|||
/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
|
||||
|
|
|
|||
|
|
@ -6,9 +6,11 @@
|
|||
%global prerelease rc2
|
||||
%endif
|
||||
|
||||
%global examples 1
|
||||
|
||||
Summary: Qt6 - QtTool components
|
||||
Name: qt6-qttools
|
||||
Version: 6.2.3
|
||||
Version: 6.3.1
|
||||
Release: 2%{?dist}
|
||||
|
||||
License: LGPLv3 or LGPLv2
|
||||
|
|
@ -140,12 +142,15 @@ Summary: Qt6 doc tools package
|
|||
%description -n qt6-doctools
|
||||
%{summary}.
|
||||
|
||||
%if 0%{?examples}
|
||||
%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}.
|
||||
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}}
|
||||
|
|
@ -157,7 +162,7 @@ Requires: %{name}-common = %{version}-%{release}
|
|||
|
||||
|
||||
%build
|
||||
%cmake_qt6
|
||||
%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF}
|
||||
|
||||
%cmake_build
|
||||
|
||||
|
|
@ -243,6 +248,7 @@ popd
|
|||
%files libs-designer
|
||||
%{_qt6_libdir}/libQt6Designer.so.6*
|
||||
%dir %{_qt6_libdir}/cmake/Qt6Designer/
|
||||
%{_qt6_plugindir}/designer/*
|
||||
|
||||
%ldconfig_scriptlets libs-designercomponents
|
||||
|
||||
|
|
@ -265,9 +271,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
|
||||
|
|
@ -318,11 +323,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
|
||||
|
|
@ -342,6 +346,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
|
||||
|
|
@ -351,25 +356,39 @@ 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_libdir}/metatypes/qt6*_metatypes.json
|
||||
|
||||
|
||||
%files static
|
||||
%{_qt6_headerdir}/QtUiTools/
|
||||
%{_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
|
||||
%{_qt6_libdir}/metatypes/qt6*_metatypes.json
|
||||
%{_qt6_libdir}/pkgconfig/*.pc
|
||||
|
||||
%if ! 0%{?no_examples:1}
|
||||
%files static
|
||||
%{_qt6_libdir}/libQt6Designer*.prl
|
||||
%{_qt6_libdir}/libQt6Help.prl
|
||||
%{_qt6_libdir}/libQt6UiTools.prl
|
||||
|
||||
%if 0%{?examples}
|
||||
%files examples
|
||||
%{_qt6_examplesdir}/
|
||||
%{_qt6_plugindir}/designer/*
|
||||
%dir %{_qt6_libdir}/cmake/Qt6Designer
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.3.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Wed Jul 13 2022 Jan Grulich <jgrulich@redhat.com> - 6.3.1-1
|
||||
- 6.3.1
|
||||
|
||||
* Wed May 25 2022 Jan Grulich <jgrulich@redhat.com> - 6.3.0-3
|
||||
- Fix path to lprodump
|
||||
|
||||
* Wed May 25 2022 Jan Grulich <jgrulich@redhat.com> - 6.3.0-2
|
||||
- Enable examples
|
||||
|
||||
* Wed Apr 13 2022 Jan Grulich <jgrulich@redhat.com> - 6.3.0-1
|
||||
- 6.3.0
|
||||
|
||||
* Fri Feb 25 2022 Jan Grulich <jgrulich@redhat.com> - 6.2.3-2
|
||||
- Enable s390x builds
|
||||
|
||||
|
|
|
|||
|
|
@ -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<QTemporaryFile> createProjectDescription(QStringList args)
|
||||
}
|
||||
file->close();
|
||||
args << QStringLiteral("-out") << file->fileName();
|
||||
- runInternalQtTool(QStringLiteral("lprodump"), args);
|
||||
+ runInternalQtTool(QStringLiteral("lprodump-qt6"), args);
|
||||
return file;
|
||||
}
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (qttools-everywhere-src-6.2.3.tar.xz) = f783d6d74e534b5ab4e9bec7f40c8a08d8e7e7405bc9926060002938518194d0cda55c1d2f35f3d766142c277107b8caaba484b472d571b0752477d0c53c6552
|
||||
SHA512 (qttools-everywhere-src-6.3.1.tar.xz) = 6e392ef2415b14119d0c4058efa78f1a66e91c01c8f48a2f1926df43f7f1cb8fcd94f84c91fc0188baa96e3055eede6f080ca4e9f150e263c3fdc5c864649883
|
||||
|
|
|
|||
Loading…
Reference in New Issue