[spectrum/el5/master] Fix spectrum-cmake.patch

[Matej Cepl]

commit 46e7587c74ad56b1d77794e015dc709e1af2e5a6
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Jan 24 16:14:20 2011 +0100

    Fix spectrum-cmake.patch

 spectrum-cmake.patch |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/spectrum-cmake.patch b/spectrum-cmake.patch
index 0822a92..bf27c2a 100644
--- a/spectrum-cmake.patch
+++ b/spectrum-cmake.patch
@@ -1,6 +1,6 @@
-diff -up spectrum-1.4.2/CMakeLists.txt.cmake-fix spectrum-1.4.2/CMakeLists.txt
---- spectrum-1.4.2/CMakeLists.txt.cmake-fix	2010-10-08 09:15:22.000000000 +0200
-+++ spectrum-1.4.2/CMakeLists.txt	2010-10-08 16:20:05.948528059 +0200
+diff -up spectrum-1.4.7/CMakeLists.txt.RH-build spectrum-1.4.7/CMakeLists.txt
+--- spectrum-1.4.7/CMakeLists.txt.RH-build	2011-01-22 13:35:20.000000000 +0100
++++ spectrum-1.4.7/CMakeLists.txt	2011-01-24 16:12:59.159833478 +0100
 @@ -1,6 +1,6 @@
  project(spectrum)
   
@@ -9,19 +9,19 @@ diff -up spectrum-1.4.2/CMakeLists.txt.cmake-fix spectrum-1.4.2/CMakeLists.txt
  if(COMMAND cmake_policy)
  	cmake_policy(SET CMP0003 NEW)
  endif(COMMAND cmake_policy)
-@@ -207,9 +207,9 @@ set(spectrum_MOC_HDRS
+@@ -219,9 +219,9 @@ set(spectrum_MOC_HDRS
  add_executable(spectrum ${spectrum_SRCS} ${lrelease_outputs})
  
  if(DEFINED WITH_STATIC_GLOOX)
--	target_link_libraries(spectrum ${WITH_STATIC_GLOOX} -lgnutls ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} ${EVENT_LIBRARIES} -export-dynamic)
-+	target_link_libraries(spectrum ${WITH_STATIC_GLOOX} -lgnutls ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} ${EVENT_LIBRARIES} -export-dynamic -lgthread-2.0 -lpthread)
+-	target_link_libraries(spectrum ${WITH_STATIC_GLOOX} -lgnutls ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} ${EVENT_LIBRARIES} ${Magick_LIBRARY} -export-dynamic)
++	target_link_libraries(spectrum ${WITH_STATIC_GLOOX} -lgnutls ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} ${EVENT_LIBRARIES} ${Magick_LIBRARY} -export-dynamic -lgthread-2.0 -lpthread)
  else(DEFINED WITH_STATIC_GLOOX)
--	target_link_libraries(spectrum ${GLOOX_LIBRARIES} ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} ${EVENT_LIBRARIES} -export-dynamic)
-+	target_link_libraries(spectrum ${GLOOX_LIBRARIES} ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} ${EVENT_LIBRARIES} -export-dynamic -lgthread-2.0 -lpthread)
+-	target_link_libraries(spectrum ${GLOOX_LIBRARIES} ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} ${EVENT_LIBRARIES} ${Magick_LIBRARY} -export-dynamic)
++	target_link_libraries(spectrum ${GLOOX_LIBRARIES} ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} ${EVENT_LIBRARIES} ${Magick_LIBRARY} -export-dynamic -lgthread-2.0 -lpthread)
  endif(DEFINED WITH_STATIC_GLOOX)
  
  message(STATUS "Transport will be installed into: " ${CMAKE_INSTALL_PREFIX})
-@@ -351,30 +351,6 @@ ELSE(NOT GETTEXT_MSGFMT_EXECUTABLE)
+@@ -363,30 +363,6 @@ ELSE(NOT GETTEXT_MSGFMT_EXECUTABLE)
   
          ADD_CUSTOM_TARGET(translations ALL)
   
@@ -52,9 +52,9 @@ diff -up spectrum-1.4.2/CMakeLists.txt.cmake-fix spectrum-1.4.2/CMakeLists.txt
  ENDIF(NOT GETTEXT_MSGFMT_EXECUTABLE)
  
  ADD_CUSTOM_TARGET (man ALL ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/spectrumctl/make_man_page.py > ${CMAKE_CURRENT_SOURCE_DIR}/man/spectrumctl.8)
-diff -up spectrum-1.4.2/cmake_modules/FindPackageHandleStandardArgs.cmake.cmake-fix spectrum-1.4.2/cmake_modules/FindPackageHandleStandardArgs.cmake
---- spectrum-1.4.2/cmake_modules/FindPackageHandleStandardArgs.cmake.cmake-fix	2010-10-08 16:17:32.041251332 +0200
-+++ spectrum-1.4.2/cmake_modules/FindPackageHandleStandardArgs.cmake	2010-10-08 16:17:32.041251332 +0200
+diff -up spectrum-1.4.7/cmake_modules/FindPackageHandleStandardArgs.cmake.RH-build spectrum-1.4.7/cmake_modules/FindPackageHandleStandardArgs.cmake
+--- spectrum-1.4.7/cmake_modules/FindPackageHandleStandardArgs.cmake.RH-build	2011-01-24 16:10:34.622261022 +0100
++++ spectrum-1.4.7/cmake_modules/FindPackageHandleStandardArgs.cmake	2011-01-24 16:10:34.622261022 +0100
 @@ -0,0 +1,54 @@
 +# FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME (DEFAULT_MSG|"Custom failure message") VAR1 ... )
 +#    This macro is intended to be used in FindXXX.cmake modules files.