From 59f9c573f5638b71d23e02401b0d743ce15c748a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Wed, 10 Apr 2013 17:08:46 -0500
Subject: [PATCH] more cmake_path love (#929227)

---
 qt5-qtbase.spec                              | 21 +++++++++++++++++++-
 qtbase-opensource-src-5.0.2-cmake_path.patch | 13 ++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 7ded802..91a4a7c 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -8,7 +8,7 @@
 Summary: Qt5 - QtBase components
 Name:    qt5-qtbase
 Version: 5.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -24,6 +24,7 @@ Patch2: qtbase-multilib_optflags.patch
 ##upstream patches
 # https://bugzilla.redhat.com/929227
 # https://codereview.qt-project.org/52778
+# https://codereview.qt-project.org/53449
 Patch100: qtbase-opensource-src-5.0.2-cmake_path.patch
 Patch1341: 0341-Rename-qAbs-Function-for-timeval.patch
 
@@ -327,6 +328,21 @@ done
 popd
 
 
+## work-in-progress, doesn't work yet -- rex
+%if 0
+%check
+export CMAKE_PREFIX_PATH=%{buildroot}%{_prefix}
+export CTEST_OUTPUT_ON_FAILURE=1
+export PATH=%{buildroot}%{_bindir}:$PATH
+export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
+mkdir tests/auto/cmake/%{_target_platform}
+pushd tests/auto/cmake/%{_target_platform}
+cmake ..
+ctest --output-on-failure
+popd
+%endif
+
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
@@ -462,6 +478,9 @@ popd
 
 
 %changelog
+* Wed Apr 10 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.2-2
+- more cmake_path love (#929227)
+
 * Wed Apr 10 2013 Rex Dieter <rdieter@fedoraproject.org> - 5.0.2-1
 - 5.0.2
 - fix cmake config (#929227)
diff --git a/qtbase-opensource-src-5.0.2-cmake_path.patch b/qtbase-opensource-src-5.0.2-cmake_path.patch
index 1044a35..ff488b3 100644
--- a/qtbase-opensource-src-5.0.2-cmake_path.patch
+++ b/qtbase-opensource-src-5.0.2-cmake_path.patch
@@ -10,3 +10,16 @@ diff -up qtbase-opensource-src-5.0.2/mkspecs/features/data/cmake/Qt5BasicConfig.
              )
          endif()
  
+diff -up qtbase-opensource-src-5.0.2/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in.cmake_path qtbase-opensource-src-5.0.2/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+diff -up qtbase-opensource-src-5.0.2/src/corelib/Qt5CoreMacros.cmake.cmake_path qtbase-opensource-src-5.0.2/src/corelib/Qt5CoreMacros.cmake
+--- qtbase-opensource-src-5.0.2/src/corelib/Qt5CoreMacros.cmake.cmake_path	2013-04-08 19:11:13.000000000 -0500
++++ qtbase-opensource-src-5.0.2/src/corelib/Qt5CoreMacros.cmake	2013-04-10 12:47:56.296486039 -0500
+@@ -234,7 +234,7 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.9
+ 
+         foreach(_module ${_qt5_modules})
+             if (NOT Qt5${_module}_FOUND)
+-                find_package(Qt5${_module} PATHS ${_qt5Core_install_prefix} NO_DEFAULT_PATH)
++                find_package(Qt5${_module} PATHS "${CMAKE_CURRENT_LIST_DIR}/.." NO_DEFAULT_PATH)
+                 if (NOT Qt5${_module}_FOUND)
+                     message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
+                 endif()