From fc838ad760af935aa5dfec85ebb4c4a9bebe215a Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Thu, 8 Jan 2009 21:20:30 +0000
Subject: [PATCH] kdepim cmake files in correct place

---
 kdelibs-4.1.96-cmake.patch | 19 +++++++++++++++++++
 kdelibs.spec               |  7 ++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 kdelibs-4.1.96-cmake.patch

diff --git a/kdelibs-4.1.96-cmake.patch b/kdelibs-4.1.96-cmake.patch
new file mode 100644
index 0000000..fb18dff
--- /dev/null
+++ b/kdelibs-4.1.96-cmake.patch
@@ -0,0 +1,19 @@
+diff -up kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake.orig kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake
+--- kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake.orig	2009-01-08 22:14:13.000000000 +0100
++++ kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake	2009-01-08 22:14:59.000000000 +0100
+@@ -64,9 +64,13 @@
+ # See kdepimlibs/CMakeLists.txt and kdepimlibs/KdepimLibsConfig.cmake.in 
+ # for details. Alex
+ 
+-
++set(KDEPIMLIBS_VERSION 4.2.0)
++set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KdepimLibs-${KDEPIMLIBS_VERSION}/cmake)
++if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
++   set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KdepimLibs-${KDEPIMLIBS_VERSION} )
++endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+ set(_KdepimLibs_FIND_QUIETLY  ${KdepimLibs_FIND_QUIETLY})
+-find_package(KdepimLibs ${KdepimLibs_FIND_VERSION} QUIET NO_MODULE PATHS ${KDE4_LIB_DIR}/KdepimLibs/cmake )
++find_package(KdepimLibs ${KdepimLibs_FIND_VERSION} QUIET NO_MODULE PATHS ${_KdepimLibsConfig_INSTALL_DIR} )
+ set(KdepimLibs_FIND_QUIETLY ${_KdepimLibs_FIND_QUIETLY})
+ 
+ include(FindPackageHandleStandardArgs)
diff --git a/kdelibs.spec b/kdelibs.spec
index 8f26d57..21a5ca1 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.96
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -73,6 +73,7 @@ Patch18: kdelibs-4.1.72-kstandarddirs.patch
 Patch20: kdelibs-4.1.70-cmake.patch
 # allows to define a default wallpaper via plasmarc:wallpaper
 Patch21: kdelibs-4.1.85-plasma-default-wallpaper.patch
+Patch22: kdelibs-4.1.96-cmake.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version}
@@ -197,6 +198,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
 %patch21 -p1 -b .plasma-default-wallpaper
+%patch22 -p1 -b .kdepimlibs-cmake
 
 %build
 
@@ -358,6 +360,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jan 08 2009 Than Ngo <than@redhat.com> - 4.1.96-2
+- kdepim cmake files in correct place
+
 * Wed Jan 07 2009 Than Ngo <than@redhat.com> - 4.1.96-1
 - 4.2rc1