rpms/spectrum/EL-6 spectrum-0.3.1-cmake.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 spectrum.spec, 1.4, 1.5 spectrum-0.3-cmake.patch, 1.2, NONE

Wed Jul 21 15:58:16 UTC 2010

Author: mcepl

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

Modified Files:
	.cvsignore sources spectrum.spec 
Added Files:
	spectrum-0.3.1-cmake.patch 
Removed Files:
	spectrum-0.3-cmake.patch 
Log Message:
New upstream release

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

--- NEW FILE spectrum-0.3.1-cmake.patch ---
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
@@ -1,6 +1,6 @@
 project(spectrum)
  
-cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
+#cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
 if(COMMAND cmake_policy)
 	cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)
@@ -192,9 +192,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)
 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)
 endif(DEFINED WITH_STATIC_GLOOX)
 
 message(STATUS "Transport will be installed into: " ${CMAKE_INSTALL_PREFIX})
@@ -336,30 +336,6 @@ ELSE(NOT GETTEXT_MSGFMT_EXECUTABLE)
  
         ADD_CUSTOM_TARGET(translations ALL)
  
-        FILE(GLOB PO_FILES  ${CMAKE_CURRENT_SOURCE_DIR}/po/*.po)
- 
-        FOREACH(_poFile ${PO_FILES})
-                GET_FILENAME_COMPONENT(_poFileName ${_poFile} NAME)
-                STRING(REGEX REPLACE "^${catalogname}_?" "" _langCode ${_poFileName} )
-                STRING(REGEX REPLACE "\\.po$" "" _langCode ${_langCode} )
-				STRING(REGEX REPLACE "\\messages" "" _langCode ${_langCode} )
- 
-                IF( _langCode )
-                        GET_FILENAME_COMPONENT(_lang po/${_poFile} NAME_WE)
-                        SET(_gmoFile ${CMAKE_CURRENT_SOURCE_DIR}/po/${_lang}.mo)
- 
-                        ADD_CUSTOM_COMMAND(TARGET translations
-                                COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_poFile}
-                                DEPENDS ${_poFile})
-
-                        ADD_CUSTOM_COMMAND(TARGET xgettext
-                                COMMAND msgmerge ${_poFile} ${CMAKE_CURRENT_SOURCE_DIR}/po/messages.po | msgattrib --no-obsolete > ${_poFile}.new && mv ${_poFile}.new ${_poFile}
-								)
-                        INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_langCode}/LC_MESSAGES/ RENAME ${catalogname}.mo)
-                ENDIF( _langCode )
- 
-        ENDFOREACH(_poFile ${PO_FILES})
- 
 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
@@ -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.
+#    It handles the REQUIRED and QUIET argument to FIND_PACKAGE() and
+#    it also sets the <UPPERCASED_NAME>_FOUND variable.
+#    The package is found if all variables listed are TRUE.
+#    Example:
+#
+#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR)
+#
+#    LibXml2 is considered to be found, if both LIBXML2_LIBRARIES and 
+#    LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to TRUE.
+#    If it is not found and REQUIRED was used, it fails with FATAL_ERROR, 
+#    independent whether QUIET was used or not.
+#    If it is found, the location is reported using the VAR1 argument, so 
+#    here a message "Found LibXml2: /usr/lib/libxml2.so" will be printed out.
+#    If the second argument is DEFAULT_MSG, the message in the failure case will 
+#    be "Could NOT find LibXml2", if you don't like this message you can specify
+#    your own custom failure message there.
+
+MACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 )
+
+  IF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
+    SET(_FAIL_MESSAGE "Could NOT find ${_NAME}")
+  ELSE("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
+    SET(_FAIL_MESSAGE "${_FAIL_MSG}")
+  ENDIF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
+
+  STRING(TOUPPER ${_NAME} _NAME_UPPER)
+
+  SET(${_NAME_UPPER}_FOUND TRUE)
+  IF(NOT ${_VAR1})
+    SET(${_NAME_UPPER}_FOUND FALSE)
+  ENDIF(NOT ${_VAR1})
+
+  FOREACH(_CURRENT_VAR ${ARGN})
+    IF(NOT ${_CURRENT_VAR})
+      SET(${_NAME_UPPER}_FOUND FALSE)
+    ENDIF(NOT ${_CURRENT_VAR})
+  ENDFOREACH(_CURRENT_VAR)
+
+  IF (${_NAME_UPPER}_FOUND)
+    IF (NOT ${_NAME}_FIND_QUIETLY)
+        MESSAGE(STATUS "Found ${_NAME}: ${${_VAR1}}")
+    ENDIF (NOT ${_NAME}_FIND_QUIETLY)
+  ELSE (${_NAME_UPPER}_FOUND)
+    IF (${_NAME}_FIND_REQUIRED)
+        MESSAGE(FATAL_ERROR "${_FAIL_MESSAGE}")
+    ELSE (${_NAME}_FIND_REQUIRED)
+      IF (NOT ${_NAME}_FIND_QUIETLY)
+        MESSAGE(STATUS "${_FAIL_MESSAGE}")
+      ENDIF (NOT ${_NAME}_FIND_QUIETLY)
+    ENDIF (${_NAME}_FIND_REQUIRED)
+  ENDIF (${_NAME_UPPER}_FOUND)
+ENDMACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spectrum/EL-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	13 Jul 2010 19:00:46 -0000	1.3
+++ .cvsignore	21 Jul 2010 15:58:15 -0000	1.4
@@ -1 +1 @@
-spectrum-0.3.tar.gz
+spectrum-0.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spectrum/EL-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Jul 2010 19:00:46 -0000	1.4
+++ sources	21 Jul 2010 15:58:15 -0000	1.5
@@ -1 +1 @@
-476d94a73b37b9e5e330565b838cbca6  spectrum-0.3.tar.gz
+2fd151dc6fd2e9a62254a1ec736e9e42  spectrum-0.3.1.tar.gz


Index: spectrum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spectrum/EL-6/spectrum.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- spectrum.spec	21 Jul 2010 14:02:15 -0000	1.4
+++ spectrum.spec	21 Jul 2010 15:58:16 -0000	1.5
@@ -6,7 +6,7 @@
 
 Summary: XMPP transport/gateway
 Name: spectrum
-Version: 0.3
+Version: 0.3.1
 Release: 1%{?dist}
 Group: System Environment/Daemons
 # spectrumctl is GPLv3+, rest GPLv2+
@@ -79,8 +79,6 @@ make install DESTDIR=%{buildroot}
 )
 
 # Stuff that 'make install' does not install:
-install -p -D -m 644 schemas/sqlite_schema.sql \
-    %{buildroot}%{_datadir}/spectrum/schemas/sqlite_schema.sql
 install -p -D -m 644 schemas/mysql_schema.sql \
     %{buildroot}%{_datadir}/spectrum/schemas/mysql_schema.sql
 install -p -D -m 755 initscripts/fedora/spectrum \
@@ -94,11 +92,7 @@ install -d %{buildroot}%{_localstatedir}
 install -d %{buildroot}%{_sbindir}
 mv %{buildroot}%{_bindir}/spectrum %{buildroot}%{_sbindir}
 
-# Move %{_defaultdocdir}/spectrum/spectrum.cfg.example back
-mv %{buildroot}%{_defaultdocdir}/spectrum/spectrum.cfg.example .
-
-# Create a %{_sysconfdir}/spectrum directory to have something to own ;)
-install -d -m 750 %{buildroot}%{_sysconfdir}/spectrum
+mv -v %{buildroot}%{_sysconfdir}/spectrum/*.example .
 
 %clean
 rm -rf %{buildroot}
@@ -145,6 +139,10 @@ fi
 %config(noreplace) %{_sysconfdir}/logrotate.d/spectrum
 
 %changelog
+* Wed Jul 21 2010 Matěj Cepl <mcepl at redhat.com> - 0.3.1-1
+- New upstream release.
+- Restart the server on upgrade.
+
 * Tue Jul 13 2010 Matěj Cepl <mcepl at redhat.com> - 0.3-1
 - New upstream release.
 


--- spectrum-0.3-cmake.patch DELETED ---

