From 5df78231f1e1f722dc226132f3192a4f0ae50eb3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Jun 02 2018 20:42:48 +0000
Subject: Issue with KDE_INSTALL_QMLDIR (#1435525)


apply patch for real, missed in prior build

---

diff --git a/extra-cmake-modules-5.46.0-qt_prefix.patch b/extra-cmake-modules-5.46.0-qt_prefix.patch
deleted file mode 100644
index 47de00a..0000000
--- a/extra-cmake-modules-5.46.0-qt_prefix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-modify KDEInstallDirs.cmake's naive check for qt_prefix = cmake_prefix
-to also check if cmake_prefix=/usr and qt_prefix=fedora_qt_prefix (libdir/qt5)
-
-diff -up extra-cmake-modules-5.46.0/kde-modules/KDEInstallDirs.cmake.qt_prefix extra-cmake-modules-5.46.0/kde-modules/KDEInstallDirs.cmake
---- extra-cmake-modules-5.46.0/kde-modules/KDEInstallDirs.cmake.qt_prefix	2018-05-04 12:34:33.000000000 -0500
-+++ extra-cmake-modules-5.46.0/kde-modules/KDEInstallDirs.cmake	2018-05-31 09:06:12.054310355 -0500
-@@ -461,7 +461,7 @@ include("${ECM_MODULE_DIR}/ECMQueryQmake
- set(_default_KDE_INSTALL_USE_QT_SYS_PATHS OFF)
- if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS)
-     query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
--    if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
-+    if( (qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}") OR ( ("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr") AND (qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_FULL_LIBDIR}/qt5") ))
-
-         message(STATUS "Installing in the same prefix as Qt, adopting their path scheme.")
-         set(_default_KDE_INSTALL_USE_QT_SYS_PATHS ON)
-     endif()
diff --git a/extra-cmake-modules-5.47.0-qt_prefix.patch b/extra-cmake-modules-5.47.0-qt_prefix.patch
new file mode 100644
index 0000000..a0ec9db
--- /dev/null
+++ b/extra-cmake-modules-5.47.0-qt_prefix.patch
@@ -0,0 +1,12 @@
+diff -up extra-cmake-modules-5.47.0/kde-modules/KDEInstallDirs.cmake.qt_prefix extra-cmake-modules-5.47.0/kde-modules/KDEInstallDirs.cmake
+--- extra-cmake-modules-5.47.0/kde-modules/KDEInstallDirs.cmake.qt_prefix	2018-05-31 03:10:15.000000000 -0500
++++ extra-cmake-modules-5.47.0/kde-modules/KDEInstallDirs.cmake	2018-06-02 15:41:25.948999508 -0500
+@@ -461,7 +461,7 @@ include("${ECM_MODULE_DIR}/ECMQueryQmake
+ set(_default_KDE_INSTALL_USE_QT_SYS_PATHS OFF)
+ if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS)
+     query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
+-    if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
++    if( (qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}") OR ( ("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr") AND (qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_FULL_LIBDIR}/qt5")) )
+         message(STATUS "Installing in the same prefix as Qt, adopting their path scheme.")
+         set(_default_KDE_INSTALL_USE_QT_SYS_PATHS ON)
+     endif()
diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec
index 6ad3e15..1b663cd 100644
--- a/extra-cmake-modules.spec
+++ b/extra-cmake-modules.spec
@@ -40,6 +40,8 @@ BuildRequires: python2-PyQt5-devel
 Patch1: extra-cmake-modules-5.38.0-clang.patch
 # do not unconditionally link in base/core libpoppler library
 Patch2: extra-cmake-modules-5.39.0-poppler_overlinking.patch
+# https://bugzilla.redhat.com/1435525
+Patch3: extra-cmake-modules-5.47.0-qt_prefix.patch
 
 BuildRequires: kf5-rpm-macros
 %if 0%{?docs}
@@ -127,6 +129,7 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
 %changelog
 * Sat Jun 02 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.47.0-1
 - 5.47.0
+- Issue with KDE_INSTALL_QMLDIR (#1435525)
 
 * Thu May 31 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.46.0-2
 - Issue with KDE_INSTALL_QMLDIR (#1435525)