[mingw-qt5-qtbase/f19: 12/15] Revert "Try harder to fix detection of the uic tool when using CMake"

[Erik van Pienbroek]

commit 49774d3a252d7f5316621e89d292fef75ef0a2a4
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Jan 11 14:23:30 2014 +0100

    Revert "Try harder to fix detection of the uic tool when using CMake"
    
    This reverts commit 34f4b2718d4b6443ed49c3033c373dff2b9cc2c3.

 mingw-qt5-qtbase.spec       |    5 +----
 qt5-fix-cmake-support.patch |    7 ++-----
 2 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/mingw-qt5-qtbase.spec b/mingw-qt5-qtbase.spec
index ffd7fbc..412311d 100644
--- a/mingw-qt5-qtbase.spec
+++ b/mingw-qt5-qtbase.spec
@@ -23,7 +23,7 @@
 
 Name:           mingw-qt5-qtbase
 Version:        5.1.1
-Release:        5%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
+Release:        4%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
 Summary:        Qt5 for Windows - QtBase component
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -748,9 +748,6 @@ sed -i s@'#QT_TOOL'@'QT_TOOL'@ $RPM_BUILD_ROOT%{mingw64_datadir}/qt5/mkspecs/%{p
 
 
 %changelog
-* Wed Nov 27 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.1.1-5
-- Try harder to fix detection of the uic tool when using CMake
-
 * Tue Nov 26 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.1.1-4
 - Fix detection of the uic tool when using CMake (RHBZ #1019952)
 
diff --git a/qt5-fix-cmake-support.patch b/qt5-fix-cmake-support.patch
index 06351a5..d5d7dca 100644
--- a/qt5-fix-cmake-support.patch
+++ b/qt5-fix-cmake-support.patch
@@ -38,18 +38,15 @@
  
 --- src/widgets/Qt5WidgetsConfigExtras.cmake.in.orig	2013-11-26 19:48:08.588107974 +0100
 +++ src/widgets/Qt5WidgetsConfigExtras.cmake.in	2013-11-26 19:48:20.603107472 +0100
-@@ -3,9 +3,9 @@
+@@ -3,7 +3,7 @@
      add_executable(Qt5::uic IMPORTED)
  
  !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
 -    set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
 +    set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic-qt5$$CMAKE_BIN_SUFFIX\")
  !!ELSE
--    set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"$${CMAKE_BIN_DIR}uic-qt5$$CMAKE_BIN_SUFFIX\")
+     set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
  !!ENDIF
-     _qt5_Widgets_check_file_exists(${imported_location})
- 
 --- src/gui/Qt5GuiConfigExtras.cmake.in.orig	2013-10-22 23:56:20.562965370 +0200
 +++ src/gui/Qt5GuiConfigExtras.cmake.in	2013-10-22 23:57:16.142476851 +0200
 @@ -2,9 +2,9 @@