rpms/spectrum/EL-5 spectrum-0.3-cmake.patch,1.1,1.2

Matej Cepl mcepl at fedoraproject.org
Tue Jul 13 18:33:20 UTC 2010


Author: mcepl

Update of /cvs/pkgs/rpms/spectrum/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18163

Modified Files:
	spectrum-0.3-cmake.patch 
Log Message:
Forgot to add a updated patch

spectrum-0.3-cmake.patch:
 CMakeLists.txt                                    |   30 +-----------
 cmake_modules/FindPackageHandleStandardArgs.cmake |   54 ++++++++++++++++++++++
 2 files changed, 57 insertions(+), 27 deletions(-)

Index: spectrum-0.3-cmake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/spectrum/EL-5/spectrum-0.3-cmake.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- spectrum-0.3-cmake.patch	21 Jun 2010 10:12:30 -0000	1.1
+++ spectrum-0.3-cmake.patch	13 Jul 2010 18:33:20 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up spectrum/CMakeLists.txt.RH-build spectrum/CMakeLists.txt
---- spectrum/CMakeLists.txt.RH-build	2010-05-25 22:00:59.000000000 +0200
-+++ spectrum/CMakeLists.txt	2010-06-12 17:37:28.000000000 +0200
+--- spectrum/CMakeLists.txt.RH-build	2010-07-13 09:08:56.000000000 +0200
++++ spectrum/CMakeLists.txt	2010-07-13 10:23:52.000000000 +0200
 @@ -1,6 +1,6 @@
  project(spectrum)
   
@@ -9,7 +9,7 @@ diff -up spectrum/CMakeLists.txt.RH-buil
  if(COMMAND cmake_policy)
  	cmake_policy(SET CMP0003 NEW)
  endif(COMMAND cmake_policy)
-@@ -190,9 +190,9 @@ set(spectrum_MOC_HDRS
+@@ -192,9 +192,9 @@ set(spectrum_MOC_HDRS
  add_executable(spectrum ${spectrum_SRCS} ${lrelease_outputs})
  
  if(DEFINED WITH_STATIC_GLOOX)
@@ -21,7 +21,7 @@ diff -up spectrum/CMakeLists.txt.RH-buil
  endif(DEFINED WITH_STATIC_GLOOX)
  
  message(STATUS "Transport will be installed into: " ${CMAKE_INSTALL_PREFIX})
-@@ -333,30 +333,6 @@ ELSE(NOT GETTEXT_MSGFMT_EXECUTABLE)
+@@ -336,30 +336,6 @@ ELSE(NOT GETTEXT_MSGFMT_EXECUTABLE)
   
          ADD_CUSTOM_TARGET(translations ALL)
   
@@ -38,7 +38,7 @@ diff -up spectrum/CMakeLists.txt.RH-buil
 -                        SET(_gmoFile ${CMAKE_CURRENT_SOURCE_DIR}/po/${_lang}.mo)
 - 
 -                        ADD_CUSTOM_COMMAND(TARGET translations
--                                COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --check -o ${_gmoFile} ${_poFile}
+-                                COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_poFile}
 -                                DEPENDS ${_poFile})
 -
 -                        ADD_CUSTOM_COMMAND(TARGET xgettext
@@ -51,10 +51,10 @@ diff -up spectrum/CMakeLists.txt.RH-buil
 - 
  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-06-12 14:39:21.762162615 +0200
-+++ spectrum/cmake_modules/FindPackageHandleStandardArgs.cmake	2010-06-12 17:37:28.000000000 +0200
+--- /dev/null	2010-07-12 19:13:50.734841243 +0200
++++ spectrum/cmake_modules/FindPackageHandleStandardArgs.cmake	2010-07-13 09:27:07.000000000 +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.



More information about the scm-commits mailing list