Hello community, here is the log from the commit of package libqt5-qttools for openSUSE:Factory checked in at 2015-01-21 21:52:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qttools (Old) and /work/SRC/openSUSE:Factory/.libqt5-qttools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qttools" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qttools/libqt5-qttools.changes 2014-12-21 11:56:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qttools.new/libqt5-qttools.changes 2015-01-21 21:52:59.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 12 03:49:34 UTC 2015 - liujianfeng1...@gmail.com + +- Add fix-for-opensuse-qmake-qt5.patch + * Fix lupdate can't find qmake configuration file default (rh#1009893) +------------------------------------------------------------------- New: ---- fix-for-opensuse-qmake-qt5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qttools.spec ++++++ --- /var/tmp/diff_new_pack.aF31Fs/_old 2015-01-21 21:53:01.000000000 +0100 +++ /var/tmp/diff_new_pack.aF31Fs/_new 2015-01-21 21:53:01.000000000 +0100 @@ -35,6 +35,10 @@ Source12: linguist5.desktop Source13: assistant5.desktop Source14: qdbusviewer5.desktop + +# PATCH-FIX-OPENSUSE fix-for-opensuse-qmake-qt5.patch [rh#1009893] liujianfeng1...@gmail.com +Patch1: fix-for-opensuse-qmake-qt5.patch + BuildRequires: fdupes BuildRequires: libQt5WebKitWidgets-devel >= %{version} BuildRequires: libqt5-qtbase-devel >= %{version} @@ -59,6 +63,8 @@ %prep %setup -q -n qttools-opensource-src-%{real_version} +%patch1 -p0 + %package devel Summary: Qt Development Kit Group: Development/Libraries/X11 ++++++ fix-for-opensuse-qmake-qt5.patch ++++++ diff -ru src.org/linguist/lrelease/main.cpp src/linguist/lrelease/main.cpp --- src.org/linguist/lrelease/main.cpp 2014-12-06 00:24:59.000000000 +0800 +++ src/linguist/lrelease/main.cpp 2015-01-12 10:50:16.717756760 +0800 @@ -310,9 +310,9 @@ option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); if (option.qmake_abslocation.isEmpty()) #ifdef QT_BOOTSTRAPPED - option.qmake_abslocation = binDir + QLatin1String("/qmake"); + option.qmake_abslocation = binDir + QLatin1String("/qmake-qt5"); #else - option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake"); + option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt5"); #endif option.initProperties(); QMakeVfs vfs; diff -ru src.org/linguist/lupdate/main.cpp src/linguist/lupdate/main.cpp --- src.org/linguist/lupdate/main.cpp 2014-12-06 00:24:59.000000000 +0800 +++ src/linguist/lupdate/main.cpp 2015-01-12 10:50:16.718756760 +0800 @@ -1048,7 +1048,7 @@ 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(), -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org