rpms/kdegraphics/devel kdegraphics-4.0.1-system-libspectre-cmake.patch, NONE, 1.1 kdegraphics.spec, 1.131, 1.132

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23829/devel

Modified Files:
	kdegraphics.spec 
Added Files:
	kdegraphics-4.0.1-system-libspectre-cmake.patch 
Log Message:
Fix system libspectre support.

kdegraphics-4.0.1-system-libspectre-cmake.patch:

--- NEW FILE kdegraphics-4.0.1-system-libspectre-cmake.patch ---
diff -ur kdegraphics-4.0.1/okular/generators/spectre/CMakeLists.txt kdegraphics-4.0.1-system-libspectre-cmake/okular/generators/spectre/CMakeLists.txt
--- kdegraphics-4.0.1/okular/generators/spectre/CMakeLists.txt	2008-01-05 00:53:45.000000000 +0100
+++ kdegraphics-4.0.1-system-libspectre-cmake/okular/generators/spectre/CMakeLists.txt	2008-02-01 21:27:58.000000000 +0100
@@ -1,6 +1,7 @@
-add_subdirectory( libspectre conf ) 
+add_subdirectory( conf ) 
 
 include_directories(
+   ${LIBSPECTRE_INCLUDE_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}/../..
    ${CMAKE_CURRENT_BINARY_DIR}/../..
 )
@@ -21,7 +22,7 @@
 
 kde4_add_plugin(okularGenerator_ghostview ${okularGenerator_ghostview_SRCS})
 
-target_link_libraries(okularGenerator_ghostview okularcore spectreOkular ${KDE4_KDEUI_LIBRARY})
+target_link_libraries(okularGenerator_ghostview okularcore ${LIBSPECTRE_LIBRARY} ${KDE4_KDEUI_LIBRARY})
 
 install(TARGETS okularGenerator_ghostview DESTINATION ${PLUGIN_INSTALL_DIR})
 


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- kdegraphics.spec	1 Feb 2008 02:26:09 -0000	1.131
+++ kdegraphics.spec	1 Feb 2008 20:32:47 -0000	1.132
@@ -16,6 +16,8 @@
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegraphics-%{version}.tar.bz2
 # backported from trunk (KDE 4.1): http://websvn.kde.org/?view=rev&revision=768911
 Patch0:         kdegraphics-4.0.1-system-libspectre.patch
+# necessary CMakeLists.txt changes missing in the above commit
+Patch1:         kdegraphics-4.0.1-system-libspectre-cmake.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kde-filesystem >= 4
@@ -83,6 +85,7 @@
 # use system libspectre
 %patch0 -p0
 rm -rf okular/generators/spectre/libspectre
+%patch1 -p1
 
 
 %build