From cc1b8f3697b840dc6fccac357da2d0a798fe304a Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Feb 01 2008 20:32:47 +0000 Subject: Fix system libspectre support. --- diff --git a/kdegraphics-4.0.1-system-libspectre-cmake.patch b/kdegraphics-4.0.1-system-libspectre-cmake.patch new file mode 100644 index 0000000..a581cb0 --- /dev/null +++ b/kdegraphics-4.0.1-system-libspectre-cmake.patch @@ -0,0 +1,21 @@ +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}) + diff --git a/kdegraphics.spec b/kdegraphics.spec index 73f62c2..79d4b38 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -16,6 +16,8 @@ URL: http://www.kde.org/ 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 @@ Requires: kdelibs4-devel # use system libspectre %patch0 -p0 rm -rf okular/generators/spectre/libspectre +%patch1 -p1 %build