rpms/kdelibs/devel kdelibs-4.1.96-cmake.patch, NONE, 1.1 kdelibs.spec, 1.408, 1.409

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv774

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.96-cmake.patch 
Log Message:
kdepim cmake files in correct place


kdelibs-4.1.96-cmake.patch:

--- NEW FILE kdelibs-4.1.96-cmake.patch ---
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)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- kdelibs.spec	7 Jan 2009 21:51:50 -0000	1.408
+++ kdelibs.spec	8 Jan 2009 21:20:30 -0000	1.409
@@ -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 @@
 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 @@
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
 %patch21 -p1 -b .plasma-default-wallpaper
+%patch22 -p1 -b .kdepimlibs-cmake
 
 %build
 
@@ -358,6 +360,9 @@
 
 
 %changelog
+* Thu Jan 08 2009 Than Ngo <than at redhat.com> - 4.1.96-2
+- kdepim cmake files in correct place
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1