diff --git a/macros.mingw32 b/macros.mingw32 index 3f6a99d..9e64e39 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -167,6 +167,8 @@ package or when debugging this package.\ -DBUILD_SHARED_LIBS:BOOL=ON \\\ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw32/Toolchain-mingw32.cmake +%_mingw32_qmake_qt4 %{_mingw32_env} ; \ + %_qt4_qmake -win32 -spec fedora-win32-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 2c01f24..c21fcc2 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 62 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -85,7 +85,7 @@ install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts mkdir -p $RPM_BUILD_ROOT%{_bindir} pushd $RPM_BUILD_ROOT%{_bindir} -for i in mingw32-configure mingw32-make mingw32-pkg-config i686-pc-mingw32-pkg-config mingw32-cmake; do +for i in mingw32-configure mingw32-make mingw32-pkg-config i686-pc-mingw32-pkg-config mingw32-cmake mingw32-qmake-qt4; do ln -s %{_libexecdir}/mingw32-scripts $i done popd @@ -159,6 +159,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/mingw32-pkg-config %{_bindir}/i686-pc-mingw32-pkg-config %{_bindir}/mingw32-cmake +%{_bindir}/mingw32-qmake-qt4 %{_libexecdir}/mingw32-scripts %{_prefix}/i686-pc-mingw32/ %{_datadir}/mingw32 @@ -166,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 19 2010 Ivan Romanov - 62-2 +- Added mingw32-qmake-qt4 + * Mon Oct 11 2010 Erik van Pienbroek - 62-1 - Provide mingw32(odbc32.dll) for Qt