From 5f87db13fbccfa95d2243e6fb30198cf94679bfc19ab9e5bb80ce6692232a89c Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 4 Jul 2019 08:37:45 +0000 Subject: [PATCH] Accepting request 713201 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 OBS-URL: https://build.opensuse.org/request/show/713201 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qtbase?expand=0&rev=16 --- libqt5-qtbase.changes | 7 +++++++ libqt5-qtbase.spec | 11 +++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/libqt5-qtbase.changes b/libqt5-qtbase.changes index 952edc4..9d89cbc 100644 --- a/libqt5-qtbase.changes +++ b/libqt5-qtbase.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 2 13:45:37 UTC 2019 - Fabian Vogt + +- 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 + ------------------------------------------------------------------- Wed Jun 26 12:20:32 UTC 2019 - Fabian Vogt diff --git a/libqt5-qtbase.spec b/libqt5-qtbase.spec index 2e7b58a..002da74 100644 --- a/libqt5-qtbase.spec +++ b/libqt5-qtbase.spec @@ -962,19 +962,18 @@ rm -fv %{buildroot}%{libqt5_libdir}/cmake/Qt5*/Q*Plugin.cmake # This is only for Apple platforms and has a python2 dep rm -r %{buildroot}%{libqt5_archdatadir}/mkspecs/features/uikit -# 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 moc|qdbuscpp2xml|qdbusxml2cpp|qmake|rcc|syncqt|uic) - 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}-qt5 + ln -s %{libqt5_bindir}/$i %{buildroot}%{_bindir}/${i} ;; esac done