From 118f7656360b46507b799107124507b8817c8f6e Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: May 29 2012 10:35:27 +0000
Subject: fix bz#820767, lrelease-qt4 tries to run qmake not qmake-qt4


---

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..e84446c 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,18 +1,21 @@
-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)
+diff -up qt-everywhere-opensource-src-4.8.2/tools/linguist/lrelease/main.cpp.linguist_qtmake-qt4 qt-everywhere-opensource-src-4.8.2/tools/linguist/lrelease/main.cpp
+--- qt-everywhere-opensource-src-4.8.2/tools/linguist/lrelease/main.cpp.linguist_qtmake-qt4	2012-04-26 21:45:50.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.2/tools/linguist/lrelease/main.cpp	2012-05-29 12:17:03.416561535 +0200
+@@ -314,9 +314,9 @@ int main(int argc, char **argv)
+             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"));
  #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
+diff -up qt-everywhere-opensource-src-4.8.2/tools/linguist/lupdate/main.cpp.linguist_qtmake-qt4 qt-everywhere-opensource-src-4.8.2/tools/linguist/lupdate/main.cpp
+--- qt-everywhere-opensource-src-4.8.2/tools/linguist/lupdate/main.cpp.linguist_qtmake-qt4	2012-04-26 21:45:50.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.2/tools/linguist/lupdate/main.cpp	2012-05-29 11:46:48.811134546 +0200
 @@ -765,7 +765,7 @@ int main(int argc, char **argv)
  
          parseHandler.verbose = evalHandler.verbose = !!(options & Verbose);
diff --git a/qt.spec b/qt.spec
index ff63b1e..b09a7f9 100644
--- a/qt.spec
+++ b/qt.spec
@@ -16,7 +16,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.8.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@@ -1089,6 +1089,9 @@ fi
 
 
 %changelog
+* Tue May 29 2012 Than Ngo <than@redhat.com> - 4.8.2-2
+- fix bz#820767, lrelease-qt4 tries to run qmake not qmake-qt4
+
 * Tue May 22 2012 Than Ngo <than@redhat.com> - 4.8.2-1
 - 4.8.2