rpm/libqt5-qtbase
SHA256
1
0
Fork 0
forked from pool/libqt5-qtbase
Code Pull Requests Activity

Accepting request 713201 from home:Vogtinator:qt5.13

Browse Source 
- 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
This commit is contained in:
Luca Beltrame 2019-07-04 08:37:45 +00:00 committed by Git OBS Bridge
parent e25a4c083c
commit 5f87db13fb
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libqt5-qtbase.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 2 13:45:37 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
-------------------------------------------------------------------
Wed Jun 26 12:20:32 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>

11
libqt5-qtbase.spec
View File

@ -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