From 50774421fd8bbeb6ce510799b7d3dd15a9ac4339 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin@tigcc.ticalc.org>
Date: Jan 11 2015 03:06:45 +0000
Subject: Don't unset old-style variables in KDEInstallDirs.cmake


* Sun Jan 11 2015 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1.6.0-2
- Do not unset old-style variables in KDEInstallDirs.cmake, it breaks projects
  using GNUInstallDirs for some parts and KDEInstallDirs for others.

---

diff --git a/extra-cmake-modules-1.6.0-KDEInstallDirs-no-unset.patch b/extra-cmake-modules-1.6.0-KDEInstallDirs-no-unset.patch
new file mode 100644
index 0000000..04d1fa5
--- /dev/null
+++ b/extra-cmake-modules-1.6.0-KDEInstallDirs-no-unset.patch
@@ -0,0 +1,22 @@
+diff -ur extra-cmake-modules-1.6.0/kde-modules/KDEInstallDirs.cmake extra-cmake-modules-1.6.0-KDEInstallDirs-no-unset/kde-modules/KDEInstallDirs.cmake
+--- extra-cmake-modules-1.6.0/kde-modules/KDEInstallDirs.cmake	2014-12-28 18:34:30.000000000 +0100
++++ extra-cmake-modules-1.6.0-KDEInstallDirs-no-unset/kde-modules/KDEInstallDirs.cmake	2015-01-11 03:58:29.000000000 +0100
+@@ -290,10 +290,6 @@
+             CACHE PATH
+                   "${docstring} (${_docpath})"
+                   FORCE)
+-        unset(${_oldstylename} CACHE)
+-        if(_cmakename AND ${_cmakename})
+-            unset(${_cmakename} CACHE)
+-        endif()
+     elseif(${_cmakename})
+         if(_cmakename_is_deprecated AND NOT CMAKE_VERSION VERSION_LESS 3.0.0)
+             message(DEPRECATION "${_cmakename} is deprecated, use KDE_INSTALL_${varname} instead.")
+@@ -304,7 +300,6 @@
+             CACHE PATH
+                   "${docstring} (${_docpath})"
+                   FORCE)
+-        unset(${_cmakename} CACHE)
+     elseif(NOT KDE_INSTALL_${varname})
+         set(KDE_INSTALL_${varname} ""
+             CACHE PATH "${docstring} (${_docpath})")
diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec
index d666214..356a713 100644
--- a/extra-cmake-modules.spec
+++ b/extra-cmake-modules.spec
@@ -5,11 +5,14 @@ Summary:        Additional modules for CMake build system
 # ECM does not follow the frameworks versioning, but is currently being
 # released together with it
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 License:        BSD
 URL:            http://community.kde.org/KDE_Core/Platform_11/Buildsystem/FindFilesSurvey
 Source0:        http://download.kde.org/stable/frameworks/%{frameworksversion}/%{name}-%{version}.tar.xz
+# Do not unset old-style variables in KDEInstallDirs.cmake, it breaks projects
+# using GNUInstallDirs for some parts and KDEInstallDirs for others.
+Patch0:         extra-cmake-modules-1.6.0-KDEInstallDirs-no-unset.patch
 BuildArch:      noarch
 
 BuildRequires:  cmake >= 2.8.12
@@ -22,6 +25,8 @@ Additional modules for CMake build system needed by KDE Frameworks.
 
 %prep
 %setup -q
+# KDEInstallDirs-no-unset
+%patch0 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -40,6 +45,10 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %{_datadir}/ECM
 
 %changelog
+* Sun Jan 11 2015 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1.6.0-2
+- Do not unset old-style variables in KDEInstallDirs.cmake, it breaks projects
+  using GNUInstallDirs for some parts and KDEInstallDirs for others
+
 * Thu Jan 08 2015 Daniel Vrátil <dvratil@redhat.com> - 1.6.0-1
 - extra-cmake-modules 1.6.0 (KDE Frameworks 5.6.0)