[mingw32-qt-qmake] Use the name 'win32-g++-fedora-cross' instead of 'win32-fedora-cross'

[epienbro]

commit fa6493e692fa94f9b1868f57ed9eb6e76b057f5e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Oct 11 20:22:55 2010 +0200

    Use the name 'win32-g++-fedora-cross' instead of 'win32-fedora-cross'
    
    - Use the name 'win32-g++-fedora-cross' instead of 'win32-fedora-cross' as
      mkspecs platform name. People compiling Qt applications using the
      Fedora MinGW toolchain have to use this new name when invoking qmake
    - Dropped some duplicate declarations from the qmake.conf file
    - Use the correct strip command in the qmake.conf file
    - Fixed the %defattr tag

 mingw32-qt-qmake.spec |   14 +++++++++++---
 qmake.conf            |    4 +---
 2 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/mingw32-qt-qmake.spec b/mingw32-qt-qmake.spec
index 08ae032..6a2249e 100644
--- a/mingw32-qt-qmake.spec
+++ b/mingw32-qt-qmake.spec
@@ -8,12 +8,12 @@
 
 #global pre beta1
 
-%global platform win32-fedora-cross
+%global platform win32-g++-fedora-cross
 %global compatplatform fedora-win32-cross
 
 Name:           mingw32-qt-qmake
 Version:        4.7.0
-Release:        1%{?pre}%{?dist}
+Release:        2%{?pre}%{?dist}
 Summary:        Qt for Windows Build Environment
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -65,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc LGPL_EXCEPTION.txt LICENSE.GPL3 LICENSE.LGPL
 %{_libdir}/qt4/mkspecs/%{platform}
 %if 0%{?compatplatform:1}
@@ -74,6 +74,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 11 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.7.0-2
+- Use the name 'win32-g++-fedora-cross' instead of 'win32-fedora-cross' as
+  mkspecs platform name. People compiling Qt applications using the
+  Fedora MinGW toolchain have to use this new name when invoking qmake
+- Dropped some duplicate declarations from the qmake.conf file
+- Use the correct strip command in the qmake.conf file
+- Fixed the %%defattr tag
+
 * Sat Sep 25 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.7.0-1
 - Update to 4.7.0
 - Automatically set QT_LIBINFIX to "4" in avoid users to provide it
diff --git a/qmake.conf b/qmake.conf
index a81924d..2adec2e 100644
--- a/qmake.conf
+++ b/qmake.conf
@@ -82,8 +82,6 @@ QMAKE_COPY_DIR        = $(COPY) -a
 QMAKE_MOVE            = mv -f
 QMAKE_DEL_FILE        = rm -f
 QMAKE_DEL_DIR         = rmdir
-QMAKE_STRIP           = strip
-QMAKE_STRIPFLAGS_LIB += --strip-unneeded
 QMAKE_INSTALL_FILE    = install -m 644 -p
 QMAKE_INSTALL_PROGRAM = install -m 755 -p
 
@@ -106,6 +104,6 @@ QMAKE_ZIP		= zip -r -9
 
 QT_LIBINFIX		= 4
 
-QMAKE_STRIP		= strip
+QMAKE_STRIP		= i686-pc-mingw32-strip
 QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
 load(qt_config)