rpms/kdelibs/devel kdelibs-4.1.96-cmake.patch, 1.1, 1.2 kdelibs.spec, 1.412, 1.413

[Than Ngo]

Author: than

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

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


kdelibs-4.1.96-cmake.patch:

Index: kdelibs-4.1.96-cmake.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs-4.1.96-cmake.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.1.96-cmake.patch	8 Jan 2009 21:20:30 -0000	1.1
+++ kdelibs-4.1.96-cmake.patch	10 Jan 2009 20:54:00 -0000	1.2
@@ -17,3 +17,22 @@
  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)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- kdelibs.spec	9 Jan 2009 15:45:59 -0000	1.412
+++ kdelibs.spec	10 Jan 2009 20:54:00 -0000	1.413
@@ -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 @@
 
 
 %changelog
+* Sat Jan 10 2009 Than Ngo <than at redhat.com> - 4.1.96-5
+- kdeworkspace cmake files in correct place
+
 * Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-4
 - bump min deps (cmake, kde-filesystem, phonon)
 - kde.(sh|csh): cleanup QT_PLUGIN_PATH handling