[mingw-qt5-qtbase/f19: 14/15] Revert "Fix CMake support (RHBZ #1019952, RHBZ #1019947)"

[Erik van Pienbroek]

commit 6363f7785294ccdd342f00be95f627ba550bae0b
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Jan 11 14:23:38 2014 +0100

    Revert "Fix CMake support (RHBZ #1019952, RHBZ #1019947)"
    
    This reverts commit 03e2ee55bfecc61afe880100e2dbb2664d4cb950.

 e29b35024e3adf3b58770573cb512395bc5fe176.patch |   33 -------
 mingw-qt5-qtbase.spec                          |   11 +--
 qt5-fix-cmake-support.patch                    |  115 ------------------------
 3 files changed, 1 insertions(+), 158 deletions(-)
---
diff --git a/mingw-qt5-qtbase.spec b/mingw-qt5-qtbase.spec
index 66f2359..b63f9ff 100644
--- a/mingw-qt5-qtbase.spec
+++ b/mingw-qt5-qtbase.spec
@@ -23,7 +23,7 @@
 
 Name:           mingw-qt5-qtbase
 Version:        5.1.1
-Release:        3%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
+Release:        2%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
 Summary:        Qt5 for Windows - QtBase component
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -42,10 +42,6 @@ Source0:        http://download.qt-project.org/official_releases/qt/%{release_ve
 Source1:        qmake.conf.win32
 Source2:        qmake.conf.win64
 
-# Fix CMake support (RHBZ #1019952, RHBZ #1019947)
-Patch0:         qt5-fix-cmake-support.patch
-Patch1:         e29b35024e3adf3b58770573cb512395bc5fe176.patch
-
 # When building Qt as static library some files have a different content
 # when compared to the static library. Merge those changes manually.
 # This patch also applies some additional changes which are required to make
@@ -251,8 +247,6 @@ Static version of the mingw64-qt5-qtbase library.
 %prep
 %setup -q -n %{source_folder}
 
-%patch0 -p0 -b .cmake
-%patch1 -p1 -b .cmake
 %patch3 -p0 -b .merge_static_shared
 %patch9 -p0 -b .angle
 %patch10 -p0 -b .external_angle
@@ -748,9 +742,6 @@ sed -i s@'#QT_TOOL'@'QT_TOOL'@ $RPM_BUILD_ROOT%{mingw64_datadir}/qt5/mkspecs/%{p
 
 
 %changelog
-* Sun Nov 17 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.1.1-3
-- Fix CMake support (RHBZ #1019952, RHBZ #1019947)
-
 * Thu Sep 12 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.1.1-2
 - Removed DBus 'interface' workaround patch as the issue is resolved in DBus upstream