[mingw-qt] Really fix the lrelease issue this time

[Erik van Pienbroek]

commit 24a224219b5f907fd518011135f4e50d3444d250
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri May 18 11:50:38 2012 +0200

    Really fix the lrelease issue this time

 mingw-qt.spec                                      |    5 ++++-
 ...e-opensource-src-4.8.1-linguist_qmake-qt4.patch |   12 ++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/mingw-qt.spec b/mingw-qt.spec
index 2f74e02..2b72a3d 100644
--- a/mingw-qt.spec
+++ b/mingw-qt.spec
@@ -14,7 +14,7 @@
 
 Name:           mingw-qt
 Version:        4.8.1
-Release:        3%{?pre}%{?dist}
+Release:        4%{?pre}%{?dist}
 Summary:        Qt for Windows
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -1051,6 +1051,9 @@ sed -i s@'$${QT_LIBINFIX}d'@'d$${QT_LIBINFIX}'@ $RPM_BUILD_ROOT%{mingw64_datadir
 
 
 %changelog
+* Thu May 17 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.8.1-4
+- Really fix the lrelease issue this time
+
 * Thu May 17 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.8.1-3
 - lrelease-qt4 tries to run qmake not qmake-qt4 (#820767)
   commit copied over from the native qt package
diff --git a/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch b/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch
index 91faeda..71266f4 100644
--- a/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch
+++ b/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch
@@ -1,15 +1,15 @@
 diff -up qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp.qmake-qt4 qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp
 --- qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp.qmake-qt4	2012-03-14 09:01:12.000000000 -0500
 +++ qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp	2012-05-11 08:58:12.902149676 -0500
-@@ -316,7 +316,7 @@ int main(int argc, char **argv)
+@@ -314,7 +314,7 @@
+             parseHandler.verbose = evalHandler.verbose = cd.isVerbose();
+             ProFileOption option;
  #ifdef QT_BOOTSTRAPPED
-             option.initProperties(binDir + QLatin1String("/qmake"));
+-            option.initProperties(binDir + QLatin1String("/qmake"));
++            option.initProperties(binDir + QLatin1String("/qmake-qt4"));
  #else
--            option.initProperties(app.applicationDirPath() + QLatin1String("/qmake"));
-+            option.initProperties(app.applicationDirPath() + QLatin1String("/qmake-qt4"));
+             option.initProperties(app.applicationDirPath() + QLatin1String("/qmake"));
  #endif
-             ProFileParser parser(0, &parseHandler);
-             ProFileEvaluator visitor(&option, &parser, &evalHandler);
 diff -up qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp.qmake-qt4 qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp
 --- qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp.qmake-qt4	2012-03-14 09:01:12.000000000 -0500
 +++ qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp	2012-05-11 09:02:47.393718054 -0500