diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 726087d..3ca28cd 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -30,7 +30,7 @@ Patch1: qttools-opensource-src-5.3.2-system-clucene.patch # help lrelease/lupdate use/prefer qmake-qt5 # https://bugzilla.redhat.com/show_bug.cgi?id=1009893 -Patch2: qttools-opensource-src-5.2.0-qmake-qt5.patch +Patch2: qttools-opensource-src-5.5.0-qmake-qt5.patch ## upstream patches diff --git a/qttools-opensource-src-5.2.0-qmake-qt5.patch b/qttools-opensource-src-5.5.0-qmake-qt5.patch similarity index 56% rename from qttools-opensource-src-5.2.0-qmake-qt5.patch rename to qttools-opensource-src-5.5.0-qmake-qt5.patch index 83c5604..431d7af 100644 --- a/qttools-opensource-src-5.2.0-qmake-qt5.patch +++ b/qttools-opensource-src-5.5.0-qmake-qt5.patch @@ -1,7 +1,7 @@ -diff -up qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp.qmake-qt5 qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp ---- qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp.qmake-qt5 2013-11-26 19:01:52.000000000 -0600 -+++ qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp 2013-12-02 11:33:01.346611970 -0600 -@@ -318,9 +318,9 @@ int main(int argc, char **argv) +diff -up qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp.qmake-qt5 qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp +--- qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp.qmake-qt5 2015-06-29 15:13:45.000000000 -0500 ++++ qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp 2015-07-16 10:23:49.664773033 -0500 +@@ -310,9 +310,9 @@ int main(int argc, char **argv) option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); if (option.qmake_abslocation.isEmpty()) #ifdef QT_BOOTSTRAPPED @@ -13,10 +13,10 @@ diff -up qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp.qmake-q #endif option.initProperties(); QMakeVfs vfs; -diff -up qttools-opensource-src-5.2.0-rc1/src/linguist/lupdate/main.cpp.qmake-qt5 qttools-opensource-src-5.2.0-rc1/src/linguist/lupdate/main.cpp ---- qttools-opensource-src-5.2.0-rc1/src/linguist/lupdate/main.cpp.qmake-qt5 2013-11-26 19:01:52.000000000 -0600 -+++ qttools-opensource-src-5.2.0-rc1/src/linguist/lupdate/main.cpp 2013-12-02 11:33:01.347611960 -0600 -@@ -1070,7 +1070,7 @@ int main(int argc, char **argv) +diff -up qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp.qmake-qt5 qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp +--- qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp.qmake-qt5 2015-06-29 15:13:46.000000000 -0500 ++++ qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp 2015-07-16 10:23:49.665773055 -0500 +@@ -1048,7 +1048,7 @@ int main(int argc, char **argv) ProFileGlobals option; option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); if (option.qmake_abslocation.isEmpty())