From bbbb68e2793fbce8844f8d72490bc9826a6d4b74 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Sat, 10 Jan 2009 20:54:00 +0000
Subject: [PATCH] kdeworkspace cmake files in correct place

---
 kdelibs-4.1.96-cmake.patch | 19 +++++++++++++++++++
 kdelibs.spec               |  5 ++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/kdelibs-4.1.96-cmake.patch b/kdelibs-4.1.96-cmake.patch
index fb18dff..71bb680 100644
--- a/kdelibs-4.1.96-cmake.patch
+++ b/kdelibs-4.1.96-cmake.patch
@@ -16,4 +16,23 @@ diff -up kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake.orig kdelibs-4.1.96/c
 +find_package(KdepimLibs ${KdepimLibs_FIND_VERSION} QUIET NO_MODULE PATHS ${_KdepimLibsConfig_INSTALL_DIR} )
  set(KdepimLibs_FIND_QUIETLY ${_KdepimLibs_FIND_QUIETLY})
  
+ include(FindPackageHandleStandardArgs)
+diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake.orig kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake
+--- kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake.orig	2009-01-10 21:53:41.000000000 +0100
++++ kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake	2009-01-10 21:54:03.000000000 +0100
+@@ -62,8 +62,14 @@
+ # for details. Alex
+ 
+ 
++set(KDE4WORKSPACE_VERSION 4.2.0)
++set(_KdeWorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace-${KDE4WORKSPACE_VERSION}/cmake)
++if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
++   set(_KdeWorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KDE4Workspace-${KDE4WORKSPACE_VERSION} )
++endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
++
+ set(_KDE4Workspace_FIND_QUIETLY  ${KDE4Workspace_FIND_QUIETLY})
+-find_package(KDE4Workspace QUIET NO_MODULE PATHS ${KDE4_LIB_DIR}/KDE4Workspace/cmake )
++find_package(KDE4Workspace QUIET NO_MODULE PATHS ${_KdeWorkspaceConfig_INSTALL_DIR} )
+ set(KDE4Workspace_FIND_QUIETLY ${_KDE4Workspace_FIND_QUIETLY})
+ 
  include(FindPackageHandleStandardArgs)
diff --git a/kdelibs.spec b/kdelibs.spec
index 3ccb547..8c84f03 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.96
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -365,6 +365,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jan 10 2009 Than Ngo <than@redhat.com> - 4.1.96-5
+- kdeworkspace cmake files in correct place
+
 * Fri Jan 09 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.1.96-4
 - bump min deps (cmake, kde-filesystem, phonon)
 - kde.(sh|csh): cleanup QT_PLUGIN_PATH handling