Hello community, here is the log from the commit of package libqt5-qttools for openSUSE:Factory checked in at 2019-07-13 13:45:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qttools (Old) and /work/SRC/openSUSE:Factory/.libqt5-qttools.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qttools" Sat Jul 13 13:45:13 2019 rev:44 rq:713346 version:5.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qttools/libqt5-qttools.changes 2019-06-28 16:30:24.586285269 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qttools.new.4615/libqt5-qttools.changes 2019-07-13 13:59:48.450908819 +0200 @@ -1,0 +2,20 @@ +Tue Jul 2 13:47:14 UTC 2019 - Fabian Vogt <[email protected]> + +- 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 <[email protected]> + +- Merge fix-for-opensuse-lrelease-qt5.patch and + fix-for-opensuse-qmake-qt5.patch into add-qt5-suffix.patch + +------------------------------------------------------------------- +Mon Jul 1 11:18:26 UTC 2019 - Jiri Slaby <[email protected]> + +- add fix-for-opensuse-lrelease-qt5.patch + Fixes build of other projects as our lrelease is called lrelease-qt5. + +------------------------------------------------------------------- Old: ---- fix-for-opensuse-qmake-qt5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qttools.spec ++++++ --- /var/tmp/diff_new_pack.MEE3eM/_old 2019-07-13 13:59:49.038908639 +0200 +++ /var/tmp/diff_new_pack.MEE3eM/_new 2019-07-13 13:59:49.042908639 +0200 @@ -1,7 +1,7 @@ # # spec file for package libqt5-qttools # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,9 +12,10 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %if 0%{?suse_version} >= 1330 %bcond_without qdoc %else @@ -28,7 +29,7 @@ Version: 5.13.0 Release: 0 Summary: Qt 5 QtTools Module -License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only +License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 OR LGPL-3.0-only Group: Development/Libraries/X11 Url: https://www.qt.io %define base_name libqt5 @@ -42,8 +43,6 @@ Source13: assistant5.desktop Source14: qdbusviewer5.desktop Source99: libqt5-qttools-rpmlintrc -# PATCH-FIX-OPENSUSE fix-for-opensuse-qmake-qt5.patch [rh#1009893] [email protected] -Patch0: fix-for-opensuse-qmake-qt5.patch BuildRequires: fdupes %if %{with qdoc} BuildRequires: clang-devel >= 3.9.0 @@ -220,19 +219,18 @@ # 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 @@ -261,7 +259,7 @@ %{_bindir}/qtdiag* %{_bindir}/qtplugininfo* %{_bindir}/qtattributionsscanner* -%{_bindir}/qdistancefieldgenerator +%{_bindir}/qdistancefieldgenerator* %{_bindir}/qcollectiongenerator* %{_libqt5_bindir}/assistant* %{_libqt5_bindir}/designer* @@ -323,11 +321,10 @@ %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}
