[spectrum/el5/master: 1/2] New version of spectrum-cmake.patch

[Matej Cepl]

commit 594b4ea57e851aaa639870fd35e171b5ad1af3b0
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Fri Oct 8 17:08:58 2010 +0200

    New version of spectrum-cmake.patch

 spectrum-cmake.patch |   26 +++++++++++++-------------
 spectrum.spec        |    6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/spectrum-cmake.patch b/spectrum-cmake.patch
index cc8bf5a..0822a92 100644
--- a/spectrum-cmake.patch
+++ b/spectrum-cmake.patch
@@ -1,6 +1,6 @@
-diff -up spectrum/CMakeLists.txt.RH-build spectrum/CMakeLists.txt
---- spectrum/CMakeLists.txt.RH-build	2010-07-13 09:08:56.000000000 +0200
-+++ spectrum/CMakeLists.txt	2010-07-13 10:23:52.000000000 +0200
+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
 @@ -1,6 +1,6 @@
  project(spectrum)
   
@@ -9,19 +9,19 @@ diff -up spectrum/CMakeLists.txt.RH-build spectrum/CMakeLists.txt
  if(COMMAND cmake_policy)
  	cmake_policy(SET CMP0003 NEW)
  endif(COMMAND cmake_policy)
-@@ -192,9 +192,9 @@ set(spectrum_MOC_HDRS
+@@ -207,9 +207,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} -export-dynamic)
-+	target_link_libraries(spectrum ${WITH_STATIC_GLOOX} -lgnutls ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} -export-dynamic -lgthread-2.0 -lpthread)
+-	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)
  else(DEFINED WITH_STATIC_GLOOX)
--	target_link_libraries(spectrum ${GLOOX_LIBRARIES} ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} -export-dynamic)
-+	target_link_libraries(spectrum ${GLOOX_LIBRARIES} ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} -export-dynamic -lgthread-2.0 -lpthread)
+-	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)
  endif(DEFINED WITH_STATIC_GLOOX)
  
  message(STATUS "Transport will be installed into: " ${CMAKE_INSTALL_PREFIX})
-@@ -336,30 +336,6 @@ ELSE(NOT GETTEXT_MSGFMT_EXECUTABLE)
+@@ -351,30 +351,6 @@ ELSE(NOT GETTEXT_MSGFMT_EXECUTABLE)
   
          ADD_CUSTOM_TARGET(translations ALL)
   
@@ -51,10 +51,10 @@ diff -up spectrum/CMakeLists.txt.RH-build spectrum/CMakeLists.txt
 - 
  ENDIF(NOT GETTEXT_MSGFMT_EXECUTABLE)
  
- ADD_CUSTOM_TARGET (man ALL python ${CMAKE_CURRENT_SOURCE_DIR}/spectrumctl/make_man_page.py > ${CMAKE_CURRENT_SOURCE_DIR}/man/spectrumctl.8)
-diff -up /dev/null spectrum/cmake_modules/FindPackageHandleStandardArgs.cmake
---- /dev/null	2010-07-12 19:13:50.734841243 +0200
-+++ spectrum/cmake_modules/FindPackageHandleStandardArgs.cmake	2010-07-13 09:27:07.000000000 +0200
+ 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
 @@ -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.
diff --git a/spectrum.spec b/spectrum.spec
index 78b336b..9b9f48e 100644
--- a/spectrum.spec
+++ b/spectrum.spec
@@ -33,7 +33,7 @@ Requires(pre): shadow-utils
 Requires(preun): initscripts, chkconfig
 Requires(postun): initscripts
 Requires(post): chkconfig
-%if 0%{?rhel} <= 5 && 0%{?fedora} < 7
+%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
 ExcludeArch: ppc
 %endif
 
@@ -43,7 +43,7 @@ their friends who are using one of the supported networks. Spectrum is written
 in C++ and uses the Gloox XMPP library and libpurple for “legacy networks”.
 Spectrum supports a wide range of different networks such as ICQ, XMPP (Jabber,
 GTalk), AIM, MSN, Facebook, Twitter, Gadu-Gadu, IRC and SIMPLE.
-%if 0%{?rhel} <= 5 && 0%{?fedora} < 7
+%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
 Users of RHEL-5 Server need to have RHEL Optional Productivity Apps channel
 switched on in order to get libpurple.
 %endif
@@ -51,7 +51,7 @@ switched on in order to get libpurple.
 %prep
 %setup -q
 
-%if 0%{?rhel} <= 5 && 0%{?fedora} < 7
+%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
 %patch1 -p1 -b .RH-build
 %endif
 %patch2 -p1 -b .failed-test