diff --git a/.gitignore b/.gitignore index 92c926a..53b30b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /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 diff --git a/qt6-qttools.spec b/qt6-qttools.spec index b72f6af..f28588d 100644 --- a/qt6-qttools.spec +++ b/qt6-qttools.spec @@ -2,7 +2,7 @@ Summary: Qt6 - QtTool components Name: qt6-qttools -Version: 6.0.3 +Version: 6.1.0 Release: 1%{?dist} License: LGPLv3 or LGPLv2 @@ -176,9 +176,9 @@ mkdir %{buildroot}%{_bindir} pushd %{buildroot}%{_qt6_bindir} for i in * ; do case "${i}" in - assistant|designer|lconvert|linguist|lrelease|lupdate|lprodump|pixeltool| \ + assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool| \ qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator| \ - qtplugininfo|qtattributionsscanner|qtpaths|lrelease-pro|lupdate-pro | \ + qtplugininfo|qtattributionsscanner|qtpaths| \ qdistancefieldgenerator|qdoc|qtdiag) ln -v ${i} %{buildroot}%{_bindir}/${i}-qt6 ln -sv ${i} ${i}-qt6 @@ -190,6 +190,16 @@ for i in * ; do done popd +pushd %{buildroot}%{_libdir} +for i in * ; do + case "${i}" in + lprodump|lrelease-pro|lupdate-pro) + ln -v ${i} %{buildroot}%{_libdir}/${i}-qt6 + ;; + esac +done +popd + ## .prl/.la file love # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs pushd %{buildroot}%{_qt6_libdir} @@ -286,12 +296,12 @@ popd %{_bindir}/lconvert* %{_bindir}/lrelease* %{_bindir}/lupdate* -%{_bindir}/lprodump* %{_qt6_bindir}/lconvert* %{_qt6_bindir}/lrelease* %{_qt6_bindir}/lupdate* -%{_qt6_bindir}/lprodump* - +%{_libdir}/lprodump* +%{_libdir}/lrelease* +%{_libdir}/lupdate* %files -n qt6-qdbusviewer %{_bindir}/qdbusviewer* @@ -361,6 +371,9 @@ popd %changelog +* Thu May 06 2021 Jan Grulich - 6.1.0-1 +- 6.1.0 + * Mon Apr 05 2021 Jan Grulich - 6.0.3-1 - 6.0.3 diff --git a/qttools-run-qttools-with-qt6-suffix.patch b/qttools-run-qttools-with-qt6-suffix.patch index 2735d1f..d450270 100644 --- a/qttools-run-qttools-with-qt6-suffix.patch +++ b/qttools-run-qttools-with-qt6-suffix.patch @@ -1,18 +1,5 @@ -diff --git a/src/linguist/lprodump/main.cpp b/src/linguist/lprodump/main.cpp -index 9ef5faa..4d94ca3 100644 ---- a/src/linguist/lprodump/main.cpp -+++ b/src/linguist/lprodump/main.cpp -@@ -443,7 +443,7 @@ int main(int argc, char **argv) - ProFileGlobals option; - option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); - if (option.qmake_abslocation.isEmpty()) -- option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake"); -+ option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt6"); - option.debugLevel = proDebug; - option.initProperties(); - option.setCommandLineArguments(QDir::currentPath(), diff --git a/src/linguist/lrelease-pro/main.cpp b/src/linguist/lrelease-pro/main.cpp -index bd20eea..f548cac 100644 +index bd20eea..6d80738 100644 --- a/src/linguist/lrelease-pro/main.cpp +++ b/src/linguist/lrelease-pro/main.cpp @@ -145,6 +145,6 @@ int main(int argc, char **argv) @@ -24,7 +11,7 @@ index bd20eea..f548cac 100644 return 0; } diff --git a/src/linguist/lupdate-pro/main.cpp b/src/linguist/lupdate-pro/main.cpp -index 1910467..31de421 100644 +index 1910467..160b421 100644 --- a/src/linguist/lupdate-pro/main.cpp +++ b/src/linguist/lupdate-pro/main.cpp @@ -154,6 +154,6 @@ int main(int argc, char **argv) @@ -36,14 +23,14 @@ index 1910467..31de421 100644 return 0; } diff --git a/src/linguist/shared/runqttool.cpp b/src/linguist/shared/runqttool.cpp -index 1bf043a..319cf80 100644 +index caf1e41..7d854cc 100644 --- a/src/linguist/shared/runqttool.cpp +++ b/src/linguist/shared/runqttool.cpp -@@ -114,6 +114,6 @@ std::unique_ptr createProjectDescription(QStringList args) +@@ -119,6 +119,6 @@ std::unique_ptr createProjectDescription(QStringList args) } file->close(); args << QStringLiteral("-out") << file->fileName(); -- runQtTool(QStringLiteral("lprodump"), args); -+ runQtTool(QStringLiteral("lprodump-qt6"), args); +- runInternalQtTool(QStringLiteral("lprodump"), args); ++ runInternalQtTool(QStringLiteral("lprodump-qt6"), args); return file; } diff --git a/sources b/sources index 67afad2..b97bd1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qttools-everywhere-src-6.0.3.tar.xz) = 764eec6ab506e90bebe113359fcc9a83c3c258587ba47a1887a0a3dff370909844710acfec53def3990493d9c3055c4064c6edf05979cdde5fa0acd05bcd4d9b +SHA512 (qttools-everywhere-src-6.1.0.tar.xz) = 63170743564a13b3bf29faed70d239a8e2c4c8de1019297762d1718c22d68de52e61c443dbb302f62fe0dd3da65de5af585060268059ae8b0eb21ca71d9e6c8b