[mingw32-qt-qmake] The QT_LIBINFIX change applied in 4.7.0-1 turned out to be broken

[epienbro]

commit a9363ab747394528d4298605773b04f4769bc3cd
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Nov 14 12:21:24 2010 +0100

    The QT_LIBINFIX change applied in 4.7.0-1 turned out to be broken

 mingw32-qt-qmake.spec |    6 +++++-
 qmake.conf            |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/mingw32-qt-qmake.spec b/mingw32-qt-qmake.spec
index 7799179..4a2a200 100644
--- a/mingw32-qt-qmake.spec
+++ b/mingw32-qt-qmake.spec
@@ -13,7 +13,7 @@
 
 Name:           mingw32-qt-qmake
 Version:        4.7.1
-Release:        1%{?pre}%{?dist}
+Release:        2%{?pre}%{?dist}
 Summary:        Qt for Windows Build Environment
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -74,6 +74,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 14 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.7.1-2
+- The QT_LIBINFIX change applied in 4.7.0-1 turned out to be broken
+  Should work okay now
+
 * Sat Nov 13 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.7.1-1
 - Update to 4.7.1
 
diff --git a/qmake.conf b/qmake.conf
index 2adec2e..f234788 100644
--- a/qmake.conf
+++ b/qmake.conf
@@ -102,8 +102,8 @@ QMAKE_LIB		= i686-pc-mingw32-ar -ru
 QMAKE_RC		= i686-pc-mingw32-windres
 QMAKE_ZIP		= zip -r -9
 
-QT_LIBINFIX		= 4
-
 QMAKE_STRIP		= i686-pc-mingw32-strip
 QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
 load(qt_config)
+
+QT_LIBINFIX		= 4