Fri Jun 25 09:58:55 UTC 2010

Author: peter

Update of /cvs/pkgs/rpms/sems/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3709/F-12

Modified Files:
	import.log sems.spec 
Added Files:
	sems-0001-Force-to-use-system-wide-GSM-includes.patch 
	sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch 
	sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch 
	sems-0004-Fix-for-old-python-2.4.patch 
	sems-0005-More-compatibility-with-older-CMake-2.4.patch 
	sems-0006-Typo-paramater-parameter.patch 
	sems-0007-Copy-paste-typo-this-conf-file-actually-is-a-early_a.patch 
	sems-0008-Fix-MOD_NAME-passing-to-gcc.patch 
	sems-0009-More-CMake-templates-for-config-files.patch 
	sems-0010-Fix-newest-variables-escaping-strategy-on-new-CMake.patch 
	sems-0011-Disable-mysql-in-conference-and-early_announce-modul.patch 
Removed Files:
	sems--0001-Force-to-use-system-wide-GSM-includes.patch 
	sems--0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch 
	sems--0003-Relax-requirements-for-CMake-version.patch 
	sems--0004-Set-CFG_PREFIX-to-empty-string-by-default.patch 
	sems--0005-Enable-support-for-CMake-2.4.patch 
Log Message:
Several fixes

sems-0001-Force-to-use-system-wide-GSM-includes.patch:
 gsm.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE sems-0001-Force-to-use-system-wide-GSM-includes.patch ---
>From eff73786b505f8be8bf54815c379323f01cf7fd2 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 31 Mar 2010 11:52:52 +0400
Subject: [PATCH 01/11] Force to use system-wide GSM includes

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
 core/plug-in/gsm/gsm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/core/plug-in/gsm/gsm.c b/core/plug-in/gsm/gsm.c
index 805ef78..bfc6a59 100644
--- a/core/plug-in/gsm/gsm.c
+++ b/core/plug-in/gsm/gsm.c
@@ -27,7 +27,7 @@
 
 #include "amci.h"
 #include "codecs.h"
-#include "gsm-1.0-pl10/inc/gsm.h"
+#include <gsm.h>
 #include "../../log.h"
 
 #include <stdlib.h>
-- 
1.7.0.1


sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch:
 CMakeLists.txt |   10 ----------
 1 file changed, 10 deletions(-)

--- NEW FILE sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch ---
>From d4fd6eb9b0964fdf982c35a919b254d1f50a6c2d Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 31 Mar 2010 11:53:48 +0400
Subject: [PATCH 02/11] Allow rewrite of custom makefiles by CMake

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
 CMakeLists.txt |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 518b14c..c7c6e40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,15 +9,6 @@ SET(SEMS_EXTRA_VERSION dev)
 SET(SEMS_VERSION
     "${SEMS_MAJOR_VERSION}.${SEMS_MINOR_VERSION}.${SEMS_BUILD_VERSION}")
 
-IF(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE)
-	message(FATAL_ERROR "In-source builds are not allowed.
-CMake would overwrite all makefiles distributed with SEMS.
-Please create a directory and run cmake from there, passing the path
-to this source directory as the last argument.
-This process created the file `CMakeCache.txt' and the directory `CMakeFiles'.
-Please delete them.")
-ENDIF(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE)
-
 OPTION(SEMS_USE_SPANDSP       "Build with spandsp" OFF)
 OPTION(SEMS_USE_LIBSAMPLERATE "Build with libsamplerate" OFF)
 OPTION(SEMS_USE_ZRTP          "Build with ZRTP" OFF)
-- 
1.7.0.1


sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch:
 CMakeLists.txt |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch ---
>From fae8f9be9808a690bf8e75fa9b330b32f6953e28 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 31 Mar 2010 18:56:39 +0400
Subject: [PATCH 03/11] Set CFG_PREFIX to empty string by default

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
 CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7c6e40..e0d749a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ OPTION(MAX_RTP_SESSIONS:int   "How many rtp sessions SEMS will handle simultaneo
 SET(CMAKE_DL_LIBS ${CMAKE_DL_LIBS} m pthread)
 
 IF (NOT SEMS_CFG_PREFIX)
-	SET(SEMS_CFG_PREFIX "/usr/local")
+	SET(SEMS_CFG_PREFIX "")
 ENDIF (NOT SEMS_CFG_PREFIX)
 MESSAGE(STATUS "SEMS cfg prefix was set to: ${SEMS_CFG_PREFIX}")
 
-- 
1.7.0.1


sems-0004-Fix-for-old-python-2.4.patch:
 Ivr.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE sems-0004-Fix-for-old-python-2.4.patch ---
>From 981076a117ca8dd86b7f500c9ecf1def548ff008 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 1 May 2010 22:19:48 +0400
Subject: [PATCH 04/11] Fix for old python 2.4

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
 apps/ivr/Ivr.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/apps/ivr/Ivr.cpp b/apps/ivr/Ivr.cpp
index f4ed59f..1a0dccb 100644
--- a/apps/ivr/Ivr.cpp
+++ b/apps/ivr/Ivr.cpp
@@ -229,7 +229,7 @@ void IvrFactory::import_object(PyObject* m, const char* name, PyTypeObject* type
     return;
   }
   Py_INCREF(type);
-  PyModule_AddObject(m, name, (PyObject *)type);
+  PyModule_AddObject(m, (char*)name, (PyObject *)type);
 }
 
 void IvrFactory::import_ivr_builtins()
-- 
1.7.0.1


sems-0005-More-compatibility-with-older-CMake-2.4.patch:
 CMakeLists.txt                                       |    2 +-
 apps/diameter_client/CMakeLists.txt                  |    2 --
 apps/diameter_client/lib_dbase/CMakeLists.txt        |    1 +
 apps/py_sems/CMakeLists.txt                          |    3 ---
 apps/py_sems/sip/CMakeLists.txt                      |    1 +
 apps/xmlrpc2di/CMakeLists.txt                        |    3 ---
 apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt           |    1 +
 cmake/config.rules.txt                               |    2 +-
 cmake/python.rules.txt                               |    4 ++--
 core/plug-in/binrpcctrl/CMakeLists.txt               |    3 ---
 core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt |    1 +
 core/plug-in/ilbc/CMakeLists.txt                     |    4 ----
 12 files changed, 8 insertions(+), 19 deletions(-)

--- NEW FILE sems-0005-More-compatibility-with-older-CMake-2.4.patch ---
>From 70caab6374a2c288d589be0e7200a06c6c5bfa4f Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 18 May 2010 17:31:11 +0000
Subject: [PATCH 05/11] More compatibility with older CMake (2.4).

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
 CMakeLists.txt                                     |    2 +-
 apps/diameter_client/CMakeLists.txt                |    2 --
 apps/diameter_client/lib_dbase/CMakeLists.txt      |    1 +
 apps/py_sems/CMakeLists.txt                        |    3 ---
 apps/py_sems/sip/CMakeLists.txt                    |    1 +
 apps/xmlrpc2di/CMakeLists.txt                      |    3 ---
 apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt         |    1 +
 cmake/config.rules.txt                             |    2 +-
 cmake/python.rules.txt                             |    4 ++--
 core/plug-in/binrpcctrl/CMakeLists.txt             |    3 ---
 .../binrpcctrl/libbinrpc/src/CMakeLists.txt        |    1 +
 core/plug-in/ilbc/CMakeLists.txt                   |    3 ---
 13 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0d749a..0cfb538 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 
 PROJECT (SEMS)
 
diff --git a/apps/diameter_client/CMakeLists.txt b/apps/diameter_client/CMakeLists.txt
index c510194..a7ce86a 100644
--- a/apps/diameter_client/CMakeLists.txt
+++ b/apps/diameter_client/CMakeLists.txt
@@ -6,8 +6,6 @@ ServerConnection.cpp
 ADD_SUBDIRECTORY (lib_dbase)
 INCLUDE_DIRECTORIES (lib_dbase)
 
-SET_PROPERTY(TARGET libdbase PROPERTY IMPORTED_LOCATION ./lib_dbase/libdbase.a)
-
 SET(sems_module_name diameter_client)
 SET(sems_module_libs libdbase)
 
diff --git a/apps/diameter_client/lib_dbase/CMakeLists.txt b/apps/diameter_client/lib_dbase/CMakeLists.txt
index 62016f9..138f636 100644
--- a/apps/diameter_client/lib_dbase/CMakeLists.txt
+++ b/apps/diameter_client/lib_dbase/CMakeLists.txt
@@ -9,4 +9,5 @@ IF(OPENSSL_FOUND)
 ENDIF(OPENSSL_FOUND)
 
 ADD_LIBRARY(libdbase STATIC ${libdbase_SRCS})
+ADD_CUSTOM_COMMAND(TARGET libdbase POST_BUILD COMMAND cp ARGS liblibdbase.a libliblibdbase.a)
 
diff --git a/apps/py_sems/CMakeLists.txt b/apps/py_sems/CMakeLists.txt
index 91bc246..40b7be3 100644
--- a/apps/py_sems/CMakeLists.txt
+++ b/apps/py_sems/CMakeLists.txt
@@ -18,11 +18,8 @@ EXECUTE_PROCESS(COMMAND python-config --libs OUTPUT_VARIABLE PYTHON_LIB_FLAGS OU
 SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${PYTHON_LIB_FLAGS}")
 
 ADD_SUBDIRECTORY (sip)
-
 INCLUDE_DIRECTORIES (sip)
 
-SET_PROPERTY(TARGET sip PROPERTY IMPORTED_LOCATION ./sip/sip.a)
-
 SET(sems_module_name py_sems)
 SET(sems_module_libs sip)
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
diff --git a/apps/py_sems/sip/CMakeLists.txt b/apps/py_sems/sip/CMakeLists.txt
index edcd6d7..81d4df4 100644
--- a/apps/py_sems/sip/CMakeLists.txt
+++ b/apps/py_sems/sip/CMakeLists.txt
@@ -18,4 +18,5 @@ sippy_sems_libstring.cpp
 
 EXECUTE_PROCESS(COMMAND python configure.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 ADD_LIBRARY(sip STATIC ${sip_SRCS})
+ADD_CUSTOM_COMMAND(TARGET sip POST_BUILD COMMAND cp ARGS libsip.a liblibsip.a)
 
diff --git a/apps/xmlrpc2di/CMakeLists.txt b/apps/xmlrpc2di/CMakeLists.txt
index d4ef304..a11ac3b 100644
--- a/apps/xmlrpc2di/CMakeLists.txt
+++ b/apps/xmlrpc2di/CMakeLists.txt
@@ -5,11 +5,8 @@ XMLRPC2DI.cpp
 )
 
 ADD_SUBDIRECTORY (xmlrpc++)
-
 INCLUDE_DIRECTORIES (xmlrpc++/src)
 
-SET_PROPERTY(TARGET xmlrpcpp PROPERTY IMPORTED_LOCATION ./xmlrpc++/src/xmlrpcpp.a)
-
 SET(sems_module_name xmlrpc2di)
 SET(sems_module_libs xmlrpcpp)
 
diff --git a/apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt b/apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt
index f4a1299..42a4b34 100644
--- a/apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt
+++ b/apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt
@@ -19,4 +19,5 @@ XmlRpcValue.cpp
 # Solaris: -lsocket -lnsl
 
 ADD_LIBRARY(xmlrpcpp STATIC ${xmlrpcpp_SRCS})
+ADD_CUSTOM_COMMAND(TARGET xmlrpcpp POST_BUILD COMMAND cp ARGS libxmlrpcpp.a liblibxmlrpcpp.a)
 
diff --git a/cmake/config.rules.txt b/cmake/config.rules.txt
index 1bc81d8..a04a4d5 100644
--- a/cmake/config.rules.txt
+++ b/cmake/config.rules.txt
@@ -1,6 +1,6 @@
 FOREACH (config_file ${sems_module_name} ${sems_config_files})
 	# Check whether we providing a template for this config
-	FIND_PATH(SEMS_${sems_module_name}_CONFIG_${config_file}_TEMPLATE ${config_file}.conf.cmake PATHS ./etc)
+	FIND_PATH(SEMS_${sems_module_name}_CONFIG_${config_file}_TEMPLATE ${config_file}.conf.cmake PATHS ${CMAKE_CURRENT_SOURCE_DIR}/etc)
 
 	IF (SEMS_${sems_module_name}_CONFIG_${config_file}_TEMPLATE)
 		# If we do provide a template, then process it and create real
diff --git a/cmake/python.rules.txt b/cmake/python.rules.txt
index 54f7880..b7d37ad 100644
--- a/cmake/python.rules.txt
+++ b/cmake/python.rules.txt
@@ -1,7 +1,7 @@
-FUNCTION(PYTHON_SOURCES_COMPILE python_files sems_python_dir)
+MACRO(PYTHON_SOURCES_COMPILE python_files sems_python_dir)
 	FOREACH (python_file ${python_files})
 		EXECUTE_PROCESS(COMMAND python -c "import py_compile; py_compile.compile('${CMAKE_CURRENT_SOURCE_DIR}/${python_file}')")
 		EXECUTE_PROCESS(COMMAND python -O -c "import py_compile; py_compile.compile('${CMAKE_CURRENT_SOURCE_DIR}/${python_file}')")
 		INSTALL (FILES ${python_file} ${python_file}c ${python_file}o DESTINATION ${SEMS_EXEC_PREFIX}/${SEMS_LIBDIR}/sems/${sems_python_dir})
 	ENDFOREACH(python_file ${python_files})
-ENDFUNCTION()
+ENDMACRO(PYTHON_SOURCES_COMPILE python_files sems_python_dir)
diff --git a/core/plug-in/binrpcctrl/CMakeLists.txt b/core/plug-in/binrpcctrl/CMakeLists.txt
index 27ced92..3899407 100644
--- a/core/plug-in/binrpcctrl/CMakeLists.txt
+++ b/core/plug-in/binrpcctrl/CMakeLists.txt
@@ -5,11 +5,8 @@ CtrlServer.cpp
 )
 
 ADD_SUBDIRECTORY (libbinrpc)
-
 INCLUDE_DIRECTORIES (libbinrpc/include)
 
-SET_PROPERTY(TARGET libbinrpc PROPERTY IMPORTED_LOCATION ./libbinrpc/src/binrpcctrl.a)
-
 SET(sems_module_name binrpcctrl)
 SET(sems_module_libs libbinrpc)
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
diff --git a/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt b/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt
index 90dda19..a8df076 100644
--- a/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt
+++ b/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt
@@ -34,4 +34,5 @@ ADD_DEFINITIONS(-DBINRPC_LIB_VER="1.0-1" -D_LIBBINRPC_BUILD -DNDEBUG)
 
 ADD_LIBRARY(libbinrpc STATIC ${libbinrpc_SRCS})
 SET_TARGET_PROPERTIES(libbinrpc PROPERTIES OUTPUT_NAME "libbinrpc")
+ADD_CUSTOM_COMMAND(TARGET libbinrpc POST_BUILD COMMAND cp ARGS liblibbinrpc.a libliblibbinrpc.a)
 
diff --git a/core/plug-in/ilbc/CMakeLists.txt b/core/plug-in/ilbc/CMakeLists.txt
index 959f268..1f4dcfb 100644
--- a/core/plug-in/ilbc/CMakeLists.txt
+++ b/core/plug-in/ilbc/CMakeLists.txt
@@ -3,11 +3,8 @@ set (ilbc_SRCS
 )
 
 ADD_SUBDIRECTORY (iLBC_rfc3951)
-
 INCLUDE_DIRECTORIES (iLBC_rfc3951)
 
-SET_PROPERTY(TARGET libilbc PROPERTY IMPORTED_LOCATION ./iLBC_rfc3951/ilbc.a)
-
 SET(sems_module_name ilbc)
 SET(sems_module_libs libilbc)
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
-- 
1.7.0.1


sems-0006-Typo-paramater-parameter.patch:
 conference/Conference.cpp        |    4 ++--
 early_announce/EarlyAnnounce.cpp |    4 ++--
 voicemail/AnswerMachine.cpp      |    5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

--- NEW FILE sems-0006-Typo-paramater-parameter.patch ---
>From d5cdf8f173398c3a46754efebdcb7b5d2194d559 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 2 Jun 2010 09:15:40 +0000
Subject: [PATCH 06/11] Typo: paramater => parameter

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/sems/branches/1.2@1942 8eb893ce-cfd4-0310-b710-fb5ebe64c474
---
 apps/conference/Conference.cpp        |    4 ++--
 apps/early_announce/EarlyAnnounce.cpp |    4 ++--
 apps/voicemail/AnswerMachine.cpp      |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/conference/Conference.cpp b/apps/conference/Conference.cpp
index 4e7a6b4..06ff807 100644
--- a/apps/conference/Conference.cpp
+++ b/apps/conference/Conference.cpp
@@ -175,13 +175,13 @@ int ConferenceFactory::onLoad()
 
   mysql_user = cfg.getParameter("mysql_user");
   if (mysql_user.empty()) {
-    ERROR("conference.conf paramater 'mysql_user' is missing.\n");
+    ERROR("conference.conf parameter 'mysql_user' is missing.\n");
     return -1;
   }
 
   mysql_passwd = cfg.getParameter("mysql_passwd");
   if (mysql_passwd.empty()) {
-    ERROR("conference.conf paramater 'mysql_passwd' is missing.\n");
+    ERROR("conference.conf parameter 'mysql_passwd' is missing.\n");
     return -1;
   }
 
diff --git a/apps/early_announce/EarlyAnnounce.cpp b/apps/early_announce/EarlyAnnounce.cpp
index 2accada..0802758 100644
--- a/apps/early_announce/EarlyAnnounce.cpp
+++ b/apps/early_announce/EarlyAnnounce.cpp
@@ -178,13 +178,13 @@ int EarlyAnnounceFactory::onLoad()
 
   mysql_user = cfg.getParameter("mysql_user");
   if (mysql_user.empty()) {
-    ERROR("conference.conf paramater 'mysql_user' is missing.\n");
+    ERROR("conference.conf parameter 'mysql_user' is missing.\n");
     return -1;
   }
 
   mysql_passwd = cfg.getParameter("mysql_passwd");
   if (mysql_passwd.empty()) {
-    ERROR("conference.conf paramater 'mysql_passwd' is missing.\n");
+    ERROR("conference.conf parameter 'mysql_passwd' is missing.\n");
     return -1;
   }
 
diff --git a/apps/voicemail/AnswerMachine.cpp b/apps/voicemail/AnswerMachine.cpp
index 35ad77a..d834dc7 100644
--- a/apps/voicemail/AnswerMachine.cpp
+++ b/apps/voicemail/AnswerMachine.cpp
@@ -393,13 +393,13 @@ int AnswerMachineFactory::onLoad()
 
   mysql_user = cfg.getParameter("mysql_user");
   if (mysql_user.empty()) {
-    ERROR("voicemail.conf paramater 'mysql_user' is missing.\n");
+    ERROR("voicemail.conf parameter 'mysql_user' is missing.\n");
     return -1;
   }
 
   mysql_passwd = cfg.getParameter("mysql_passwd");
   if (mysql_passwd.empty()) {
-    ERROR("voicemail.conf paramater 'mysql_passwd' is missing.\n");
+    ERROR("voicemail.conf parameter 'mysql_passwd' is missing.\n");
     return -1;
   }
 
-- 
1.7.0.1


sems-0007-Copy-paste-typo-this-conf-file-actually-is-a-early_a.patch:
 EarlyAnnounce.cpp |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE sems-0007-Copy-paste-typo-this-conf-file-actually-is-a-early_a.patch ---
>From dce67b7d86d73820adec085199a7fcc6de1fe096 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 2 Jun 2010 09:15:46 +0000
Subject: [PATCH 07/11] Copy+paste typo: this conf-file actually is a early_announce.conf

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/sems/branches/1.2@1943 8eb893ce-cfd4-0310-b710-fb5ebe64c474
---
 apps/early_announce/EarlyAnnounce.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/early_announce/EarlyAnnounce.cpp b/apps/early_announce/EarlyAnnounce.cpp
index 0802758..2db385b 100644
--- a/apps/early_announce/EarlyAnnounce.cpp
+++ b/apps/early_announce/EarlyAnnounce.cpp
@@ -178,13 +178,13 @@ int EarlyAnnounceFactory::onLoad()
 
   mysql_user = cfg.getParameter("mysql_user");
   if (mysql_user.empty()) {
-    ERROR("conference.conf parameter 'mysql_user' is missing.\n");
+    ERROR("early_announce.conf parameter 'mysql_user' is missing.\n");
     return -1;
   }
 
   mysql_passwd = cfg.getParameter("mysql_passwd");
   if (mysql_passwd.empty()) {
-    ERROR("conference.conf parameter 'mysql_passwd' is missing.\n");
+    ERROR("early_announce.conf parameter 'mysql_passwd' is missing.\n");
     return -1;
   }
 
-- 
1.7.0.1


sems-0008-Fix-MOD_NAME-passing-to-gcc.patch:
 module.rules.txt |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE sems-0008-Fix-MOD_NAME-passing-to-gcc.patch ---
>From d84e195c467dbd7a611b67f8110039916c799ada Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 2 Jun 2010 11:12:34 +0000
Subject: [PATCH 08/11] Fix MOD_NAME passing to gcc

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/sems/branches/1.2@1945 8eb893ce-cfd4-0310-b710-fb5ebe64c474
---
 cmake/module.rules.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cmake/module.rules.txt b/cmake/module.rules.txt
index 80ec94e..6299ee0 100644
--- a/cmake/module.rules.txt
+++ b/cmake/module.rules.txt
@@ -6,7 +6,7 @@
 
 ADD_LIBRARY(sems_${sems_module_name} SHARED ${${sems_module_name}_SRCS})
 
-ADD_DEFINITIONS(-DMOD_NAME="\\\"${sems_module_name}\\\"")
+ADD_DEFINITIONS(-DMOD_NAME=\\\"${sems_module_name}\\\")
 
 # all modules should be linked against ${CMAKE_DL_LIBS} at least
 # and with additional ${sems_module_libs} if they exists
-- 
1.7.0.1


sems-0009-More-CMake-templates-for-config-files.patch:
 mailbox/etc/mailbox.conf.cmake       |    5 +++++
 mailbox/etc/mailbox_query.conf.cmake |    5 +++++
 py_sems/etc/py_sems.conf.cmake       |    2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE sems-0009-More-CMake-templates-for-config-files.patch ---
>From 097859c512f325ea877d6b427a0ce9ac5d1c10fb Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 2 Jun 2010 12:02:20 +0000
Subject: [PATCH 09/11] More CMake templates for config-files

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/sems/branches/1.2@1947 8eb893ce-cfd4-0310-b710-fb5ebe64c474
---
 apps/mailbox/etc/mailbox.conf.cmake       |    5 +++++
 apps/mailbox/etc/mailbox_query.conf.cmake |    5 +++++
 apps/py_sems/etc/py_sems.conf.cmake       |    1 +
 3 files changed, 11 insertions(+), 0 deletions(-)
 create mode 100644 apps/mailbox/etc/mailbox.conf.cmake
 create mode 100644 apps/mailbox/etc/mailbox_query.conf.cmake
 create mode 100644 apps/py_sems/etc/py_sems.conf.cmake

diff --git a/apps/mailbox/etc/mailbox.conf.cmake b/apps/mailbox/etc/mailbox.conf.cmake
new file mode 100644
index 0000000..e6e7747
--- /dev/null
+++ b/apps/mailbox/etc/mailbox.conf.cmake
@@ -0,0 +1,5 @@
+#CFGOPTION_SEMS_MAILBOX_ANNOUNCEFILE
+annoucement_file=${SEMS_AUDIO_PREFIX}/sems/audio/mailbox/default_en.wav
+#ENDCFGOPTION
+
+beep_file=${SEMS_AUDIO_PREFIX}/sems/audio/mailbox/beep.wav
diff --git a/apps/mailbox/etc/mailbox_query.conf.cmake b/apps/mailbox/etc/mailbox_query.conf.cmake
new file mode 100644
index 0000000..e84316f
--- /dev/null
+++ b/apps/mailbox/etc/mailbox_query.conf.cmake
@@ -0,0 +1,5 @@
+#CFGOPTION_SEMS_MAILBOX_QUERY_WAV_DIR
+wav_dir=${SEMS_AUDIO_PREFIX}/sems/audio/mailbox/
+#ENDCFGOPTION
+
+beep_file=${SEMS_AUDIO_PREFIX}/sems/audio/mailbox/beep.wav
diff --git a/apps/py_sems/etc/py_sems.conf.cmake b/apps/py_sems/etc/py_sems.conf.cmake
new file mode 100644
index 0000000..96ba1e1
--- /dev/null
+++ b/apps/py_sems/etc/py_sems.conf.cmake
@@ -0,0 +1 @@
+script_path=${SEMS_EXEC_PREFIX}/${SEMS_LIBDIR}/sems/py_sems/
-- 
1.7.0.1


sems-0010-Fix-newest-variables-escaping-strategy-on-new-CMake.patch:
 CMakeLists.txt |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE sems-0010-Fix-newest-variables-escaping-strategy-on-new-CMake.patch ---
>From 0ebc0eb0051a62d26e9788af15b4a8cb7c2e9562 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 2 Jun 2010 13:13:04 +0000
Subject: [PATCH 10/11] Fix newest variables escaping strategy on new CMake

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/sems/trunk@1949 8eb893ce-cfd4-0310-b710-fb5ebe64c474
---
 CMakeLists.txt |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cfb538..8eb128b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,8 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 
+# Don't do automatic escaping of variables
+CMAKE_POLICY(SET CMP0005 OLD)
+
 PROJECT (SEMS)
 
 SET(SEMS_MAJOR_VERSION 1)
-- 
1.7.0.1


sems-0011-Disable-mysql-in-conference-and-early_announce-modul.patch:
 conference/CMakeLists.txt     |   12 ++++++------
 early_announce/CMakeLists.txt |   13 ++++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

--- NEW FILE sems-0011-Disable-mysql-in-conference-and-early_announce-modul.patch ---
>From 90b5fcd79d4c6366b1b8f8d12c8670968d6c70d3 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 25 Jun 2010 12:16:45 +0400
Subject: [PATCH 11/11] Disable mysql++ in conference and early_announce modules

Unfortunately, this breaks existing configurations, which is a
no-go situation for EPEL repository. We'll enable it later.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
 apps/conference/CMakeLists.txt     |   12 ++++++------
 apps/early_announce/CMakeLists.txt |   12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/conference/CMakeLists.txt b/apps/conference/CMakeLists.txt
index 40c7063..a86e8e8 100644
--- a/apps/conference/CMakeLists.txt
+++ b/apps/conference/CMakeLists.txt
@@ -13,12 +13,12 @@ IF(FLITE_FOUND AND ZRTP_FOUND)
 	SET(sems_module_libs ${sems_module_libs} flite_cmu_us_kal flite_usenglish flite_cmulex flite)
 ENDIF(FLITE_FOUND AND ZRTP_FOUND)
 
-IF(MYSQLPP_FOUND)
-	INCLUDE_DIRECTORIES(/usr/include/mysql)
-	INCLUDE_DIRECTORIES(${MYSQLPP_INCLUDE_DIR}/mysql++)
-	ADD_DEFINITIONS(-DUSE_MYSQL)
-	SET(sems_module_libs ${sems_module_libs} mysqlpp)
-ENDIF(MYSQLPP_FOUND)
+#IF(MYSQLPP_FOUND)
+#	INCLUDE_DIRECTORIES(/usr/include/mysql)
+#	INCLUDE_DIRECTORIES(${MYSQLPP_INCLUDE_DIR}/mysql++)
+#	ADD_DEFINITIONS(-DUSE_MYSQL)
+#	SET(sems_module_libs ${sems_module_libs} mysqlpp)
+#ENDIF(MYSQLPP_FOUND)
 
 SET(sems_module_name conference)
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
diff --git a/apps/early_announce/CMakeLists.txt b/apps/early_announce/CMakeLists.txt
index 184d282..1e23638 100644
--- a/apps/early_announce/CMakeLists.txt
+++ b/apps/early_announce/CMakeLists.txt
@@ -2,12 +2,12 @@ set (early_announce_SRCS
 EarlyAnnounce.cpp
 )
 
-IF(MYSQLPP_FOUND)
-	INCLUDE_DIRECTORIES(/usr/include/mysql)
-	INCLUDE_DIRECTORIES(${MYSQLPP_INCLUDE_DIR}/mysql++)
-	ADD_DEFINITIONS(-DUSE_MYSQL)
-	SET(sems_module_libs mysqlpp)
-ENDIF(MYSQLPP_FOUND)
+#IF(MYSQLPP_FOUND)
+#	INCLUDE_DIRECTORIES(/usr/include/mysql)
+#	INCLUDE_DIRECTORIES(${MYSQLPP_INCLUDE_DIR}/mysql++)
+#	ADD_DEFINITIONS(-DUSE_MYSQL)
+#	SET(sems_module_libs mysqlpp)
+#ENDIF(MYSQLPP_FOUND)
 
 SET(sems_module_name early_announce)
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
-- 
1.7.0.1



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-12/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	1 May 2010 05:19:25 -0000	1.7
+++ import.log	25 Jun 2010 09:58:55 -0000	1.8
@@ -5,3 +5,4 @@ sems-1_1_1-6_fc11:HEAD:sems-1.1.1-6.fc11
 sems-1_2_0-1_fc12:F-12:sems-1.2.0-1.fc12.src.rpm:1270129616
 sems-1_2_0-2_fc12:F-12:sems-1.2.0-2.fc12.src.rpm:1271688426
 sems-1_2_1-1_fc12:F-12:sems-1.2.1-1.fc12.src.rpm:1272691130
+sems-1_2_1-4_fc12:F-12:sems-1.2.1-4.fc12.src.rpm:1277459905


Index: sems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-12/sems.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sems.spec	1 May 2010 05:19:25 -0000	1.13
+++ sems.spec	25 Jun 2010 09:58:55 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:	SIP Express Media Server, an extensible SIP media server
 Name:		sems
 Version:	1.2.1
-Release:	1%{?dist}
+Release:	4%{?dist}
 URL:		http://www.iptel.org/sems
 ## wget http://ftp.iptel.org/pub/sems/1.2/1.2.1/src/sems-1.2.1.tar.gz
 ## tar zx --exclude iLBC_rfc3951 -f sems-1.2.1.tar.gz
@@ -10,15 +10,29 @@ Source0:	%{name}-%{version}.w_o_ilbc_sou
 License:	GPLv2+
 Group:		Applications/Communications
 # Will be proposed for inclusion in upstream
-Patch1:		sems--0001-Force-to-use-system-wide-GSM-includes.patch
+Patch1:		sems-0001-Force-to-use-system-wide-GSM-includes.patch
 # Fedora-specific
-Patch2:		sems--0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch
-# Will be proposed for inclusion in upstream
-Patch3:		sems--0003-Relax-requirements-for-CMake-version.patch
+Patch2:		sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch
 # Fedora-specific
-Patch4:		sems--0004-Set-CFG_PREFIX-to-empty-string-by-default.patch
-# RHEL-specific, will be applied upstream
-Patch5:		sems--0005-Enable-support-for-CMake-2.4.patch
+Patch3:		sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch
+# RHEL-specific
+Patch4:		sems-0004-Fix-for-old-python-2.4.patch
+# RHEL-specific, partially applied upstream
+Patch5:		sems-0005-More-compatibility-with-older-CMake-2.4.patch
+# Upstreamed
+Patch6:		sems-0006-Typo-paramater-parameter.patch
+# Upstreamed
+Patch7:		sems-0007-Copy-paste-typo-this-conf-file-actually-is-a-early_a.patch
+# Upstreamed
+Patch8:		sems-0008-Fix-MOD_NAME-passing-to-gcc.patch
+# Upstreamed
+Patch9:		sems-0009-More-CMake-templates-for-config-files.patch
+# Upstreamed, see also %%patch8
+Patch10:	sems-0010-Fix-newest-variables-escaping-strategy-on-new-CMake.patch
+# Disable MySQL++ in conference and early_announce until good docs and failover to
+# existing file-based configuration will be provided
+Patch11:	sems-0011-Disable-mysql-in-conference-and-early_announce-modul.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	python >= 2.3
 BuildRequires: sip-devel
@@ -185,11 +199,19 @@ XMLRPC servers.
 rm -rf core/plug-in/gsm/gsm-1.0-pl10/
 %patch1 -p1 -b .use_system_wide_gsm
 %patch2 -p1 -b .allow_rewrite_of_makefiles
-%patch3 -p1 -b .relax_required_cmake_ver
-%patch4 -p1 -b .cfg_prefix_to_empty_string
-%if 0%{?rhel}
-%patch5 -p1 -b .fix_for_cmake_2_4
+%patch3 -p1 -b .cfg_prefix_to_empty_string
+%if 0%{?el4}%{?el5}
+%patch4 -p1 -b .support_for_python_2_4
+%endif
+%patch5 -p1 -b .support_for_cmake_2_4
+%patch6 -p1 -b .typo
+%patch7 -p1 -b .another_typo
+%patch8 -p1 -b .fix_mod_name
+%patch9 -p1 -b .more_cmake_templates
+%if 0%{?el6}%{?fedora}
+%patch10 -p1 -b .fix_escaping_in_cmake
 %endif
+%patch11 -p1 -b .disable_mysqlpp_in_conf_and_ea
 
 
 iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client.txt > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client.{utf8,txt}
@@ -603,6 +625,18 @@ fi
 %{_libdir}/%{name}/plug-in/xmlrpc2di.so
 
 %changelog
+* Fri Jun 25 2010 Peter Lemenkov <lemenkov at gmail.com> 1.2.1-4
+- Fixed escaping variables strategy for  new CMake (and only for new CMake)
+- Disable mysql++ in early_announce and conference modules
+
+* Tue Jun  1 2010 Peter Lemenkov <lemenkov at gmail.com> 1.2.1-3
+- Fixed config-file generation for EPEL (old CMake)
+- Fixed MOD_NAME parameter passing
+- Fixed few typos
+
+* Fri May  7 2010 Peter Lemenkov <lemenkov at gmail.com> 1.2.1-2
+- Fixed build for EPEL
+
 * Fri Apr 30 2010 Peter Lemenkov <lemenkov at gmail.com> 1.2.1-1
 - Ver. 1.2.1
 - Dropped upstreamed patches


--- sems--0001-Force-to-use-system-wide-GSM-includes.patch DELETED ---


--- sems--0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch DELETED ---


--- sems--0003-Relax-requirements-for-CMake-version.patch DELETED ---


--- sems--0004-Set-CFG_PREFIX-to-empty-string-by-default.patch DELETED ---


--- sems--0005-Enable-support-for-CMake-2.4.patch DELETED ---

