Use -qt5 suffix for linguist tools

qt5-qttools.spec

@@ -10,7 +10,7 @@
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.13.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: LGPLv3 or LGPLv2
 Url:     http://www.qt.io
@@ -19,7 +19,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
 
 # help lrelease/lupdate use/prefer qmake-qt5
 # https://bugzilla.redhat.com/show_bug.cgi?id=1009893
-Patch2: qttools-opensource-src-5.5.0-qmake-qt5.patch
+Patch2: qttools-opensource-src-5.13.2-runqttools-with-qt5-suffix.patch
 
 # 32-bit MIPS needs explicit -latomic
 Patch4: qttools-opensource-src-5.7-add-libatomic.patch
@@ -166,7 +166,7 @@ Requires: %{name}-common = %{version}-%{release}
 
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{version}
-%patch2 -p1 -b .qmake-qt5
+%patch2 -p1 -b ..runqttools-with-qt5-suffix.patch
 %ifarch %{mips32}
 %patch4 -p1 -b .libatomic
 %endif
@@ -205,7 +205,7 @@ mkdir %{buildroot}%{_bindir}
 pushd %{buildroot}%{_qt5_bindir}
 for i in * ; do
   case "${i}" in
-   assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator|qtplugininfo|qtattributionsscanner)
+   assistant|designer|lconvert|linguist|lrelease|lupdate|lprodump|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator|qtplugininfo|qtattributionsscanner)
       ln -v  ${i} %{buildroot}%{_bindir}/${i}-qt5
       ln -sv ${i} ${i}-qt5
       ;;
@@ -470,12 +470,18 @@ fi
 
 
 %changelog
+* Wed Dec 18 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.2-3
+- Use -qt5 suffix for linguist tools
+
 * Wed Dec 18 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.2-2
 - Move lprodump to qt5-linguist
 
 * Mon Dec 09 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.2-1
 - 5.13.2
 
+* Thu Sep 26 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-2
+- rebuild (clang)
+
 * Tue Sep 24 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
 - 5.12.5
 

qttools-opensource-src-5.13.2-runqttools-with-qt5-suffix.patch

@@ -0,0 +1,49 @@
+diff --git a/src/linguist/lprodump/main.cpp b/src/linguist/lprodump/main.cpp
+index 857786b..2a65299 100644
+--- a/src/linguist/lprodump/main.cpp
++++ b/src/linguist/lprodump/main.cpp
+@@ -438,7 +438,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-qt5");
+     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 9f4ca25..207f401 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)
+         projectDescription->setAutoRemove(false);
+     lreleaseOptions << QStringLiteral("-project") << projectDescription->fileName();
+ 
+-    runQtTool(QStringLiteral("lrelease"), lreleaseOptions);
++    runQtTool(QStringLiteral("lrelease-qt5"), lreleaseOptions);
+     return 0;
+ }
+diff --git a/src/linguist/lupdate-pro/main.cpp b/src/linguist/lupdate-pro/main.cpp
+index ab5b7eb..1ce039c 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)
+         projectDescription->setAutoRemove(false);
+     lupdateOptions << QStringLiteral("-project") << projectDescription->fileName();
+ 
+-    runQtTool(QStringLiteral("lupdate"), lupdateOptions);
++    runQtTool(QStringLiteral("lupdate-qt5"), lupdateOptions);
+     return 0;
+ }
+diff --git a/src/linguist/shared/runqttool.cpp b/src/linguist/shared/runqttool.cpp
+index e36a3a2..020fe06 100644
+--- a/src/linguist/shared/runqttool.cpp
++++ b/src/linguist/shared/runqttool.cpp
+@@ -114,6 +114,6 @@ std::unique_ptr<QTemporaryFile> createProjectDescription(QStringList args)
+     }
+     file->close();
+     args << QStringLiteral("-out") << file->fileName();
+-    runQtTool(QStringLiteral("lprodump"), args);
++    runQtTool(QStringLiteral("lprodump-qt5"), args);
+     return file;
+ }

qttools-opensource-src-5.5.0-qmake-qt5.patch

@@ -1,13 +0,0 @@
-diff --git a/src/linguist/lprodump/main.cpp b/src/linguist/lprodump/main.cpp
-index 857786b..2a65299 100644
---- a/src/linguist/lprodump/main.cpp
-+++ b/src/linguist/lprodump/main.cpp
-@@ -438,7 +438,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-qt5");
-     option.debugLevel = proDebug;
-     option.initProperties();
-     option.setCommandLineArguments(QDir::currentPath(),