[mingw-filesystem] Added new macros for Qt5 support

[Erik van Pienbroek]

commit 4c049af9fb77a2b34c15f0c19b954c3f7e90802e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Tue Sep 18 00:10:08 2012 +0200

    Added new macros for Qt5 support
    
    - Added new macros for Qt5 support, %mingw32_qmake_qt5, %mingw64_qmake_qt5,
      %mingw_qmake_qt4 and %mingw_qmake_qt5
    - It isn't necessary to call %mingw32_env / %mingw64_env any more
      in the %mingw32_qmake_qt4 and %mingw64_qmake_qt4 macros

 macros.mingw          |   36 ++++++++++++++++++++++++++++++++++++
 macros.mingw32        |    4 ++--
 macros.mingw64        |    4 ++--
 mingw-filesystem.spec |   10 ++++++++--
 4 files changed, 48 insertions(+), 6 deletions(-)
---
diff --git a/macros.mingw b/macros.mingw
index 8c8c9d5..4d99e17 100644
--- a/macros.mingw
+++ b/macros.mingw
@@ -97,5 +97,41 @@ popd                                                   \
 }                                                      \
 run_mingw_cmake_kde4
 
+%mingw_qmake_qt4                                       \
+run_mingw_qmake_qt4()                                  \
+{                                                      \
+%if 0%{?mingw_build_win32} == 1                        \
+mkdir build_win32$MINGW_BUILDDIR_SUFFIX                \
+pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
+    %{?mingw32_qmake_qt4} "$@"                         \
+popd                                                   \
+%endif                                                 \
+%if 0%{?mingw_build_win64} == 1                        \
+mkdir build_win64$MINGW_BUILDDIR_SUFFIX                \
+pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
+    %{?mingw64_qmake_qt4} "$@"                         \
+popd                                                   \
+%endif                                                 \
+}                                                      \
+run_mingw_qmake_qt4
+
+%mingw_qmake_qt5                                       \
+run_mingw_qmake_qt5()                                  \
+{                                                      \
+%if 0%{?mingw_build_win32} == 1                        \
+mkdir build_win32$MINGW_BUILDDIR_SUFFIX                \
+pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
+    %{?mingw32_qmake_qt5} "$@"                         \
+popd                                                   \
+%endif                                                 \
+%if 0%{?mingw_build_win64} == 1                        \
+mkdir build_win64$MINGW_BUILDDIR_SUFFIX                \
+pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
+    %{?mingw64_qmake_qt5} "$@"                         \
+popd                                                   \
+%endif                                                 \
+}                                                      \
+run_mingw_qmake_qt5
+
 # Deprecated:
 %mingw_make_install         %mingw_make install
diff --git a/macros.mingw32 b/macros.mingw32
index c754da0..c61eeee 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -161,8 +161,8 @@
         ${MINGW32_CMAKE_ARGS} \\\
         "$@" $__mingw32_topdir
 
-%mingw32_qmake_qt4 %{mingw32_env} ; \
-  /usr/bin/mingw32-qmake-qt4
+%mingw32_qmake_qt4 /usr/bin/mingw32-qmake-qt4
+%mingw32_qmake_qt5 /usr/bin/mingw32-qmake-qt5
 
 %mingw32_description This is the cross-compiled version of this library / tool.\
 You should only install this package if you want to cross-compile programs for \
diff --git a/macros.mingw64 b/macros.mingw64
index 1ebe7e5..0436582 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -161,8 +161,8 @@
         ${MINGW64_CMAKE_ARGS} \\\
         "$@" $__mingw64_topdir
 
-%mingw64_qmake_qt4 %{mingw64_env} ; \
-  /usr/bin/mingw64-qmake-qt4
+%mingw64_qmake_qt4 /usr/bin/mingw64-qmake-qt4
+%mingw64_qmake_qt5 /usr/bin/mingw64-qmake-qt5
 
 %mingw64_description This is the cross-compiled version of this library / tool.\
 You should only install this package if you want to cross-compile programs for \
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 4aefd42..d97dafb 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -1,8 +1,8 @@
 %global debug_package %{nil}
 
 Name:           mingw-filesystem
-Version:        95
-Release:        14%{?dist}
+Version:        96
+Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 Group:          Development/Libraries
@@ -246,6 +246,12 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Mon Sep 17 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 96-1
+- Added new macros for Qt5 support, %%mingw32_qmake_qt5, %%mingw64_qmake_qt5,
+  %%mingw_qmake_qt4 and %%mingw_qmake_qt5
+- It isn't necessary to call %%mingw32_env / %%mingw64_env any more
+  in the %%mingw32_qmake_qt4 and %%mingw64_qmake_qt4 macros
+
 * Mon Aug 13 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 95-14
 - Fix the handling of quoted arguments in the cmake macros