[kdegraphics] * Mon Nov 22 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.80-2 - readd a FindOkular.cmake, Okula

[Kevin Kofler]

commit 0c0d7c12b73a24875ff74bec241fc3b83e9a39a9
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Mon Nov 22 21:41:41 2010 +0100

    * Mon Nov 22 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.80-2
    - readd a FindOkular.cmake, OkularConfig.cmake is not working as advertised

 kdegraphics-4.5.80-readd-FindOkular.patch |   46 +++++++++++++++++++++++++++++
 kdegraphics.spec                          |    8 ++--
 2 files changed, 50 insertions(+), 4 deletions(-)
---
diff --git a/kdegraphics-4.5.80-readd-FindOkular.patch b/kdegraphics-4.5.80-readd-FindOkular.patch
index fecb92b..67b3928 100644
--- a/kdegraphics-4.5.80-readd-FindOkular.patch
+++ b/kdegraphics-4.5.80-readd-FindOkular.patch
@@ -53,3 +53,49 @@ Index: cmake/modules/FindOkular.cmake
 +endif (OKULAR_INCLUDE_DIR AND OKULAR_LIBRARIES)
 +
 +mark_as_advanced(OKULAR_INCLUDE_DIR OKULAR_LIBRARIES)
+Index: okular/OkularConfig.cmake
+===================================================================
+--- okular/OkularConfig.cmake	(revision 1179984)
++++ okular/OkularConfig.cmake	(revision 1179983)
+@@ -1,17 +0,0 @@
+-# get from the full path to OkularConfig.cmake up to the base dir dir:
+-get_filename_component( _okularBaseDir  ${CMAKE_CURRENT_LIST_FILE} PATH)
+-get_filename_component( _okularBaseDir  ${_okularBaseDir} PATH)
+-get_filename_component( _okularBaseDir  ${_okularBaseDir} PATH)
+-get_filename_component( _okularBaseDir  ${_okularBaseDir} PATH)
+-
+-
+-# find the full paths to the library and the includes:
+-find_path(OKULAR_INCLUDE_DIR okular/core/document.h
+-          HINTS ${_okularBaseDir}/include
+-          NO_DEFAULT_PATH)
+-
+-find_library(OKULAR_CORE_LIBRARY okularcore 
+-             HINTS ${_okularBaseDir}/lib
+-             NO_DEFAULT_PATH)
+-
+-set(OKULAR_LIBRARIES ${OKULAR_CORE_LIBRARY})
+Index: okular/CMakeLists.txt
+===================================================================
+--- okular/CMakeLists.txt	(revision 1179984)
++++ okular/CMakeLists.txt	(revision 1179983)
+@@ -5,7 +5,6 @@
+ add_subdirectory( tests )
+ 
+ include(OkularConfigureChecks.cmake)
+-include(MacroWriteBasicCMakeVersionFile)
+ 
+ if(NOT WIN32)
+  set(MATH_LIB m)
+@@ -182,10 +181,3 @@
+ install( FILES okular_part.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+ install( FILES part.rc DESTINATION ${DATA_INSTALL_DIR}/okular )
+ 
+-########### cmake files #################
+-
+-macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/OkularConfigVersion.cmake 0 11 80)
+-
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/OkularConfig.cmake
+-              ${CMAKE_CURRENT_BINARY_DIR}/OkularConfigVersion.cmake
+-        DESTINATION ${LIB_INSTALL_DIR}/cmake/Okular )
+\ No newline at end of file
diff --git a/kdegraphics.spec b/kdegraphics.spec
index 719f15b..7ce6d73 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -27,8 +27,8 @@ URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegraphics-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# readd a FindOkular.cmake, still needed by kdebindings
-# FIXME/TODO: check whether this gets sorted out in kdebindings
+# readd a FindOkular.cmake, OkularConfig.cmake is not working as advertised
+# FIXME/TODO: get this sorted out properly
 Patch0:         kdegraphics-4.5.80-readd-FindOkular.patch
 
 ## upstreamable patches
@@ -270,7 +270,7 @@ fi
 %{_kde4_appsdir}/cmake/modules/FindKSane.cmake
 # see Patch0
 %{_kde4_appsdir}/cmake/modules/FindOkular.cmake
-%{_kde4_libdir}/cmake/Okular/
+#%{_kde4_libdir}/cmake/Okular/
 %{_libdir}/pkgconfig/*.pc
 
 %files -n kio_msits
@@ -281,7 +281,7 @@ fi
 
 %changelog
 * Mon Nov 22 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.80-2
-- readd a FindOkular.cmake, still needed by kdebindings
+- readd a FindOkular.cmake, OkularConfig.cmake is not working as advertised
 
 * Sat Nov 20 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5.80-1
 - 4.5.80 (4.6beta1)