commit c9f3d10acd6858a20308ee49a2f6b9a4cb837aaf
Author: Ivan Romanov <drizt(a)land.ru>
Date: Thu Mar 29 22:30:18 2012 +0600
Revert "Merge branch 'f15' into f16"
This reverts commit 1626ca006437a4180483a9a11b390e06ed0c7292, reversing
changes made to 94aa851f6ebc77586e9362b248ba0540ab5cb0ee.
Toolchain-mingw32.cmake | 2 --
mingw32-filesystem.spec | 5 +----
2 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/Toolchain-mingw32.cmake b/Toolchain-mingw32.cmake
index 2c3c9e1..9a575d0 100644
--- a/Toolchain-mingw32.cmake
+++ b/Toolchain-mingw32.cmake
@@ -20,8 +20,6 @@ SET(QT_LIBRARY_DIR ${CMAKE_FIND_ROOT_PATH}/lib)
# set the resource compiler (RHBZ #652435)
SET(CMAKE_RC_COMPILER /usr/bin/i686-pc-mingw32-windres)
-SET(CMAKE_RC_COMPILE_OBJECT
- "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> -O coff -o <OBJECT> <SOURCE>")
# override boost library suffix which defaults to -mgw
SET(Boost_COMPILER -gcc46)
diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec
index 3e590c1..7018810 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -2,7 +2,7 @@
Name: mingw32-filesystem
Version: 69
-Release: 12%{?dist}
+Release: 11%{?dist}
Summary: MinGW base filesystem and environment
Group: Development/Libraries
@@ -158,9 +158,6 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
%changelog
-* Mon Mar 26 2012 Ivan Romanov <drizt(a)land.ru> - 69-12
-- windres options for cmake (RHBZ #652435)
-
* Sun Feb 5 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 69-11
- Use a more complete list of Win32 default dlls based on the
dlls exported by wine (thanks to Levente Farkas). RHBZ #787486