From a0fbe1b948f35a691c6ba6ddac08b731438811c76795ce6d41163354a3a079c9 Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Thu, 4 Jul 2019 08:38:07 +0000
Subject: [PATCH] Accepting request 713202 from home:Vogtinator:qt5.13

- Link from Qt bindir into %_bindir, not the other way around to fix
  applicationDirPath called from Qt binaries
- Add -qt5 suffix to all binaries in %_bindir
- Drop add-qt5-suffix.patch, no longer necessary

OBS-URL: https://build.opensuse.org/request/show/713202
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qttools?expand=0&rev=11
---
 add-qt5-suffix.patch   | 34 ----------------------------------
 libqt5-qttools.changes |  8 ++++++++
 libqt5-qttools.spec    | 18 +++++++-----------
 3 files changed, 15 insertions(+), 45 deletions(-)
 delete mode 100644 add-qt5-suffix.patch

diff --git a/add-qt5-suffix.patch b/add-qt5-suffix.patch
deleted file mode 100644
index 31b7185..0000000
--- a/add-qt5-suffix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Subject: Add -qt5 suffix to executables
-
-To allow parallel installation of different versions of Qt, binaries in $PATH
-are suffixed.
-
-Original authors are liujianfeng1994@gmail.com and jslaby@suse.cz.
-
----
-Index: qttools-everywhere-src-5.13.0/src/linguist/lrelease-pro/main.cpp
-===================================================================
---- qttools-everywhere-src-5.13.0.orig/src/linguist/lrelease-pro/main.cpp
-+++ qttools-everywhere-src-5.13.0/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;
- }
-Index: qttools-everywhere-src-5.13.0/src/linguist/lprodump/main.cpp
-===================================================================
---- qttools-everywhere-src-5.13.0.orig/src/linguist/lprodump/main.cpp
-+++ qttools-everywhere-src-5.13.0/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/libqt5-qttools.changes b/libqt5-qttools.changes
index 0690987..5ee88bc 100644
--- a/libqt5-qttools.changes
+++ b/libqt5-qttools.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jul  2 13:47:14 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Link from Qt bindir into %_bindir, not the other way around to fix
+  applicationDirPath called from Qt binaries
+- Add -qt5 suffix to all binaries in %_bindir
+- Drop add-qt5-suffix.patch, no longer necessary
+
 -------------------------------------------------------------------
 Mon Jul  1 11:55:43 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
 
diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec
index 23bc2f6..eec8106 100644
--- a/libqt5-qttools.spec
+++ b/libqt5-qttools.spec
@@ -43,8 +43,6 @@ Source12:       linguist5.desktop
 Source13:       assistant5.desktop
 Source14:       qdbusviewer5.desktop
 Source99:       libqt5-qttools-rpmlintrc
-# PATCH-FIX-OPENSUSE
-Patch100:       add-qt5-suffix.patch
 BuildRequires:  fdupes
 %if %{with qdoc}
 BuildRequires:  clang-devel >= 3.9.0
@@ -221,19 +219,18 @@ find %{buildroot}/%{_libdir} -type f -name '*pc' -print -exec perl -pi -e "s, -L
 # kill .la files
 rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
 
-# put all the binaries to %_bindir, add -qt5 suffix, and symlink them back to %_qt5_bindir
+# Link all the binaries with -qt5 suffix to %{_bindir}
 mkdir -p %{buildroot}%{_bindir}
 pushd %{buildroot}%{_libqt5_bindir}
 for i in * ; do
   case "${i}" in
    assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qdoc|qhelpgenerator)
-      mv $i ../../../bin/${i}-qt5
-      ln -s ../../../bin/${i}-qt5 .
-      ln -s ../../../bin/${i}-qt5 $i
+      ln -s %{_libqt5_bindir}/$i %{buildroot}%{_bindir}/${i}-qt5
       ;;
    *)
-      mv $i ../../../bin/
-      ln -s ../../../bin/$i .
+      # No conflict with Qt4, so keep the original name for compatibility
+      ln -s %{_libqt5_bindir}/$i %{buildroot}%{_bindir}/${i}
+      ln -s %{_libqt5_bindir}/$i %{buildroot}%{_bindir}/${i}-qt5
       ;;
   esac
 done
@@ -262,7 +259,7 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{
 %{_bindir}/qtdiag*
 %{_bindir}/qtplugininfo*
 %{_bindir}/qtattributionsscanner*
-%{_bindir}/qdistancefieldgenerator
+%{_bindir}/qdistancefieldgenerator*
 %{_bindir}/qcollectiongenerator*
 %{_libqt5_bindir}/assistant*
 %{_libqt5_bindir}/designer*
@@ -324,11 +321,10 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{
 %license LICENSE.*
 %{_bindir}/qdbus-qt5
 %{_libqt5_bindir}/qdbus
-%{_libqt5_bindir}/qdbus-qt5
 
 %files -n libqt5-qtpaths
 %license LICENSE.*
-%{_bindir}/qtpaths
+%{_bindir}/qtpaths*
 %{_libqt5_bindir}/qtpaths
 
 %if %{with qdoc}