From 97e2f31e916c7bcc0a208cedb7211423d37a7afb Mon Sep 17 00:00:00 2001 From: Ivan Romanov Date: Sun, 14 Nov 2010 15:08:36 +0500 Subject: [PATCH] Removed -win32 option and fixed -spec option for mingw32-qmake-qt4 --- macros.mingw32 | 2 +- mingw32-filesystem.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/macros.mingw32 b/macros.mingw32 index 9e64e39..aa75be7 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -168,7 +168,7 @@ package or when debugging this package.\ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw32/Toolchain-mingw32.cmake %_mingw32_qmake_qt4 %{_mingw32_env} ; \ - %_qt4_qmake -win32 -spec fedora-win32-cross + %_qt4_qmake -spec win32-g++-fedora-cross %_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/mingw32-filesystem.spec b/mingw32-filesystem.spec index 61889bd..4fe0847 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 63 +Version: 64 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -167,6 +167,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 14 2010 Ivan Romanov 64-1 +- Removed -win32 option for mingw32-qmake-qt4 (is obsoletes since qt version 4.7.0) +- Using win32-g++-fedora-cross instead fedora-win32-cross spec file + * Thu Nov 11 2010 Erik van Pienbroek - 63-1 - Set the CMAKE_RC_COMPILER variable in the CMake toolchain file (RHBZ #652435)