Mon Apr 19 14:49:36 UTC 2010

Author: peter

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

Modified Files:
	import.log 
	sems--0001-Adjust-CMake-files-to-reflect-actual-SEMS-version.patch 
	sems--0002-Force-to-use-system-wide-GSM-includes.patch 
	sems--0003-Allow-rewrite-of-custom-makefiles-by-CMake.patch 
	sems--0004-Relax-requirements-for-CMake-version.patch 
	sems--0005-Disable-ilbc-plugin.patch 
	sems--0006-Fix-module-name-definition.patch 
	sems--0007-No-longer-install-SEMS-OpenSER-SER-HOWTOs.patch 
	sems--0008-Typo.patch 
	sems--0009-Set-CFG_PREFIX-to-empty-string-by-default.patch 
	sems--0010-Fix-LAME-library-detection.patch 
	sems--0012-Add-missing-files-to-CMake-target.patch 
	sems--0013-Fix-for-newest-GCC.patch sems.spec 
Added Files:
	sems--0011-Enable-py_sems.patch 
	sems--0014-Enable-support-for-CMake-2.4.patch 
	sems--0015-Really-fix-compilation-with-old-SIP-tool-for-generat.patch 
	sems--0016-Missing-.c-module-in-adpcm-CMake-makefile.patch 
Removed Files:
	sems--0011-Add-py_sems-back.patch 
Log Message:
Fixed building of the adpcm module

sems--0011-Enable-py_sems.patch:
 CMakeLists.txt |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE sems--0011-Enable-py_sems.patch ---
>From 3bbbe6f433c15c49b8bc6459c4f4cc90773afd44 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 1 Apr 2010 13:55:30 +0400
Subject: [PATCH 11/16] Enable py_sems.

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

diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 8c0e6f3..ba652c7 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -34,11 +34,11 @@ IF(PYTHONLIBS_FOUND)
 	ADD_SUBDIRECTORY(pin_collect)
 ENDIF(PYTHONLIBS_FOUND)
 ADD_SUBDIRECTORY(precoded_announce)
-#IF(PYTHONLIBS_FOUND)
-#IF(SIP_FOUND)
-#	ADD_SUBDIRECTORY(py_sems)
-#ENDIF(SIP_FOUND)
-#ENDIF(PYTHONLIBS_FOUND)
+IF(PYTHONLIBS_FOUND)
+IF(SIP_FOUND)
+	ADD_SUBDIRECTORY(py_sems)
+ENDIF(SIP_FOUND)
+ENDIF(PYTHONLIBS_FOUND)
 ADD_SUBDIRECTORY(reg_agent)
 ADD_SUBDIRECTORY(registrar_client)
 ADD_SUBDIRECTORY(sw_prepaid_sip)
-- 
1.6.6.1


sems--0014-Enable-support-for-CMake-2.4.patch:
 CMakeLists.txt                                       |    7 ++++---
 apps/diameter_client/CMakeLists.txt                  |    6 +++---
 apps/diameter_client/lib_dbase/CMakeLists.txt        |    2 +-
 apps/py_sems/CMakeLists.txt                          |    6 ++----
 apps/xmlrpc2di/CMakeLists.txt                        |    6 ++----
 cmake/audio.rules.txt                                |    2 +-
 cmake/config.rules.txt                               |    2 +-
 cmake/doc.rules.txt                                  |    4 ++--
 cmake/module.rules.txt                               |    8 ++++++++
 cmake/python.rules.txt                               |    2 +-
 core/plug-in/binrpcctrl/CMakeLists.txt               |    6 ++----
 core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt |    3 +--
 core/plug-in/ilbc/CMakeLists.txt                     |    6 ++----
 core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt        |    3 +--
 14 files changed, 31 insertions(+), 32 deletions(-)

--- NEW FILE sems--0014-Enable-support-for-CMake-2.4.patch ---
>From b4d2a9bde82eb6b25429b64d786ba71944d5f6b2 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 2 Apr 2010 15:45:38 +0400
Subject: [PATCH 14/16] Enable support for CMake 2.4

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
 CMakeLists.txt                                     |    7 ++++---
 apps/diameter_client/CMakeLists.txt                |    6 +++---
 apps/diameter_client/lib_dbase/CMakeLists.txt      |    2 +-
 apps/py_sems/CMakeLists.txt                        |    6 ++----
 apps/xmlrpc2di/CMakeLists.txt                      |    6 ++----
 cmake/audio.rules.txt                              |    2 +-
 cmake/config.rules.txt                             |    2 +-
 cmake/doc.rules.txt                                |    4 ++--
 cmake/module.rules.txt                             |    8 ++++++++
 cmake/python.rules.txt                             |    2 +-
 core/plug-in/binrpcctrl/CMakeLists.txt             |    6 ++----
 .../binrpcctrl/libbinrpc/src/CMakeLists.txt        |    3 +--
 core/plug-in/ilbc/CMakeLists.txt                   |    6 ++----
 core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt      |    2 +-
 14 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97da195..785a005 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,15 +170,16 @@ ENDIF(SEMS_USE_OPENSSL)
 
 # Let's try to find Python development files
 FIND_PACKAGE(PythonLibs)
-IF(PYTHONLIBS_FOUND)
+IF(PYTHONLIBS_FOUND OR PYTHON_LIBRARIES)
+	SET(PYTHONLIBS_FOUND TRUE)
 	GET_FILENAME_COMPONENT(PYTHON_LD_PATH ${PYTHON_LIBRARIES} PATH)
 	MESSAGE(STATUS "Found Python includes:	${PYTHON_INCLUDE_PATH}/Python.h")
 	MESSAGE(STATUS "Found Python library: ${PYTHON_LIBRARIES}")
 	MESSAGE(STATUS "Found Python library path: ${PYTHON_LD_PATH}")
 	MESSAGE(STATUS "Using Python: YES")
-ELSE(PYTHONLIBS_FOUND)
+ELSE(PYTHONLIBS_FOUND OR PYTHON_LIBRARIES)
 	MESSAGE(STATUS "Using Python: NO")
-ENDIF(PYTHONLIBS_FOUND)
+ENDIF(PYTHONLIBS_FOUND OR PYTHON_LIBRARIES)
 
 # Let's try to find SIP (Python bindings generator) development files
 FIND_PATH(SIP_INCLUDE_DIR sip.h PATHS ${PYTHON_INCLUDE_PATH})
diff --git a/apps/diameter_client/CMakeLists.txt b/apps/diameter_client/CMakeLists.txt
index c510194..5dafcf0 100644
--- a/apps/diameter_client/CMakeLists.txt
+++ b/apps/diameter_client/CMakeLists.txt
@@ -3,13 +3,13 @@ DiameterClient.cpp
 ServerConnection.cpp
 )
 
-ADD_SUBDIRECTORY (lib_dbase)
+ADD_SUBDIRECTORY (lib_dbase .)
 INCLUDE_DIRECTORIES (lib_dbase)
 
-SET_PROPERTY(TARGET libdbase PROPERTY IMPORTED_LOCATION ./lib_dbase/libdbase.a)
+#SET_PROPERTY(TARGET libdbase PROPERTY IMPORTED_LOCATION ./lib_dbase/libdbase.a)
 
 SET(sems_module_name diameter_client)
-SET(sems_module_libs libdbase)
+SET(sems_module_static_libs dbase)
 
 IF(OPENSSL_FOUND)
 	ADD_DEFINITIONS(-DWITH_OPENSSL)
diff --git a/apps/diameter_client/lib_dbase/CMakeLists.txt b/apps/diameter_client/lib_dbase/CMakeLists.txt
index 62016f9..0e7fb1e 100644
--- a/apps/diameter_client/lib_dbase/CMakeLists.txt
+++ b/apps/diameter_client/lib_dbase/CMakeLists.txt
@@ -8,5 +8,5 @@ IF(OPENSSL_FOUND)
 	ADD_DEFINITIONS(-DWITH_OPENSSL)
 ENDIF(OPENSSL_FOUND)
 
-ADD_LIBRARY(libdbase STATIC ${libdbase_SRCS})
+ADD_LIBRARY(dbase STATIC ${libdbase_SRCS})
 
diff --git a/apps/py_sems/CMakeLists.txt b/apps/py_sems/CMakeLists.txt
index 91bc246..cfa51c3 100644
--- a/apps/py_sems/CMakeLists.txt
+++ b/apps/py_sems/CMakeLists.txt
@@ -17,14 +17,12 @@ INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
 EXECUTE_PROCESS(COMMAND python-config --libs OUTPUT_VARIABLE PYTHON_LIB_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
 SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${PYTHON_LIB_FLAGS}")
 
-ADD_SUBDIRECTORY (sip)
+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)
+SET(sems_module_static_libs sip)
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt)
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/python.rules.txt)
diff --git a/apps/xmlrpc2di/CMakeLists.txt b/apps/xmlrpc2di/CMakeLists.txt
index d4ef304..2bcfd14 100644
--- a/apps/xmlrpc2di/CMakeLists.txt
+++ b/apps/xmlrpc2di/CMakeLists.txt
@@ -4,14 +4,12 @@ TOXmlRpcClient.cpp
 XMLRPC2DI.cpp
 )
 
-ADD_SUBDIRECTORY (xmlrpc++)
+ADD_SUBDIRECTORY (xmlrpc++/src .)
 
 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)
+SET(sems_module_static_libs xmlrpcpp)
 
 IF(OPENSSL_FOUND)
 	ADD_DEFINITIONS(-DHAVE_XMLRPCPP_SSL -DXMLRPCPP_SUPPORT_STRUCT_ACCESS)
diff --git a/cmake/audio.rules.txt b/cmake/audio.rules.txt
index a836524..170b821 100644
--- a/cmake/audio.rules.txt
+++ b/cmake/audio.rules.txt
@@ -2,4 +2,4 @@ FOREACH (audio_file ${audio_files})
 	INSTALL(
 		FILES wav/${audio_file} DESTINATION ${SEMS_AUDIO_PREFIX}/sems/audio/${sems_module_name}
 	)
-ENDFOREACH()
+ENDFOREACH(audio_file ${audio_files})
diff --git a/cmake/config.rules.txt b/cmake/config.rules.txt
index e3240ae..1bc81d8 100644
--- a/cmake/config.rules.txt
+++ b/cmake/config.rules.txt
@@ -14,4 +14,4 @@ FOREACH (config_file ${sems_module_name} ${sems_config_files})
 	INSTALL(
 		FILES ./etc/${config_file}.conf DESTINATION ${SEMS_CFG_PREFIX}/etc/sems/etc/
 	)
-ENDFOREACH()
+ENDFOREACH(config_file ${sems_module_name} ${sems_config_files})
diff --git a/cmake/doc.rules.txt b/cmake/doc.rules.txt
index a36f3b8..d0c724a 100644
--- a/cmake/doc.rules.txt
+++ b/cmake/doc.rules.txt
@@ -2,10 +2,10 @@ FOREACH (doc_file ${doc_files})
 	INSTALL(
 		FILES ${doc_file} DESTINATION ${SEMS_DOC_PREFIX}/sems-${SEMS_MAJOR_VERSION}.${SEMS_MINOR_VERSION}.${SEMS_BUILD_VERSION}
 	)
-ENDFOREACH()
+ENDFOREACH(doc_file ${doc_files})
 
 FOREACH (doc_dir ${doc_dirs})
 	INSTALL(
 		DIRECTORY ${doc_dir} DESTINATION ${SEMS_DOC_PREFIX}/sems-${SEMS_MAJOR_VERSION}.${SEMS_MINOR_VERSION}.${SEMS_BUILD_VERSION}
 	)
-ENDFOREACH()
+ENDFOREACH(doc_dir ${doc_dirs})
diff --git a/cmake/module.rules.txt b/cmake/module.rules.txt
index 80ec94e..4ce7570 100644
--- a/cmake/module.rules.txt
+++ b/cmake/module.rules.txt
@@ -12,6 +12,14 @@ ADD_DEFINITIONS(-DMOD_NAME="\\\"${sems_module_name}\\\"")
 # and with additional ${sems_module_libs} if they exists
 TARGET_LINK_LIBRARIES(sems_${sems_module_name} ${CMAKE_DL_LIBS} ${sems_module_libs})
 
+IF(sems_module_static_libs)
+	FOREACH(lib ${sems_module_static_libs})
+		ADD_DEPENDENCIES(sems_${sems_module_name} ${lib} )
+		SET_TARGET_PROPERTIES(sems_${sems_module_name} PROPERTIES LINK_FLAGS ./lib${lib}.a)
+	ENDFOREACH(lib)
+ENDIF(sems_module_static_libs)
+
+
 SET_TARGET_PROPERTIES(sems_${sems_module_name} PROPERTIES OUTPUT_NAME ${sems_module_name})
 
 INSTALL(
diff --git a/cmake/python.rules.txt b/cmake/python.rules.txt
index 5cce24b..54f7880 100644
--- a/cmake/python.rules.txt
+++ b/cmake/python.rules.txt
@@ -3,5 +3,5 @@ FUNCTION(PYTHON_SOURCES_COMPILE python_files sems_python_dir)
 		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()
+	ENDFOREACH(python_file ${python_files})
 ENDFUNCTION()
diff --git a/core/plug-in/binrpcctrl/CMakeLists.txt b/core/plug-in/binrpcctrl/CMakeLists.txt
index 27ced92..6560146 100644
--- a/core/plug-in/binrpcctrl/CMakeLists.txt
+++ b/core/plug-in/binrpcctrl/CMakeLists.txt
@@ -4,13 +4,11 @@ ConnPool.cpp
 CtrlServer.cpp
 )
 
-ADD_SUBDIRECTORY (libbinrpc)
+ADD_SUBDIRECTORY (libbinrpc/src .)
 
 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)
+SET(sems_module_static_libs binrpc)
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt)
diff --git a/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt b/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt
index 90dda19..ecb0cf3 100644
--- a/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt
+++ b/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt
@@ -32,6 +32,5 @@ value.c
 #
 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_LIBRARY(binrpc STATIC ${libbinrpc_SRCS})
 
diff --git a/core/plug-in/ilbc/CMakeLists.txt b/core/plug-in/ilbc/CMakeLists.txt
index 959f268..cf5742c 100644
--- a/core/plug-in/ilbc/CMakeLists.txt
+++ b/core/plug-in/ilbc/CMakeLists.txt
@@ -2,13 +2,11 @@ set (ilbc_SRCS
  ilbc.c
 )
 
-ADD_SUBDIRECTORY (iLBC_rfc3951)
+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)
+SET(sems_module_static_libs ilbc)
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
 
diff --git a/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt b/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt
index eb433f3..b3e3ffc 100644
--- a/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt
+++ b/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt
@@ -24,5 +24,5 @@ packing.c
 syntFilter.c
 )
 
-ADD_LIBRARY(libilbc STATIC ${ilbc_SRCS})
+ADD_LIBRARY(ilbc STATIC ${ilbc_SRCS})
 
-- 
1.6.6.1


sems--0015-Really-fix-compilation-with-old-SIP-tool-for-generat.patch:
 string.sip |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE sems--0015-Really-fix-compilation-with-old-SIP-tool-for-generat.patch ---
>From 7b03c2c74a9b7ae9efec6ffdaa539c0d54eda763 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 6 Apr 2010 14:56:22 +0000
Subject: [PATCH 15/16] Really fix compilation with old SIP (tool for generating bindings)

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

git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/sems/branches/1.2@1776 8eb893ce-cfd4-0310-b710-fb5ebe64c474
---
 apps/py_sems/sip/string.sip |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/apps/py_sems/sip/string.sip b/apps/py_sems/sip/string.sip
index c3372e5..6c32dbd 100644
--- a/apps/py_sems/sip/string.sip
+++ b/apps/py_sems/sip/string.sip
@@ -23,7 +23,7 @@ using std::string;
              return 0;
          }
 #if  SIP_VERSION < 0x040901
-         *sipCppPtr = (std::string *)sipForceConvertToType(sipPy, sipType_string, NULL, SIP_NO_CONVERTORS, NULL, sipIsErr);
+         *sipCppPtr = (std::string *)sipForceConvertTo_string(sipPy, sipIsErr);
 #else
          *sipCppPtr = (std::string *)sipForceConvertToType(sipPy, sipType_string, NULL, SIP_NO_CONVERTORS, NULL, sipIsErr);
 #endif
-- 
1.6.6.1


sems--0016-Missing-.c-module-in-adpcm-CMake-makefile.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sems--0016-Missing-.c-module-in-adpcm-CMake-makefile.patch ---
>From 4215f312f684acb4306a789d246d4d5a01ac7e15 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 16 Apr 2010 06:46:52 +0000
Subject: [PATCH 16/16] Missing *.c module in adpcm CMake makefile

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

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

diff --git a/core/plug-in/adpcm/CMakeLists.txt b/core/plug-in/adpcm/CMakeLists.txt
index 5055c03..da3d024 100644
--- a/core/plug-in/adpcm/CMakeLists.txt
+++ b/core/plug-in/adpcm/CMakeLists.txt
@@ -1,4 +1,5 @@
 set (adpcm_SRCS
+adpcm.c
 g711.c
 g721.c
 g723_16.c
-- 
1.6.6.1



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	1 Apr 2010 13:51:48 -0000	1.4
+++ import.log	19 Apr 2010 14:49:35 -0000	1.5
@@ -2,3 +2,4 @@ sems-1_1_0-5_fc10:F-11:sems-1.1.0-5.fc10
 sems-1_1_0-6_fc10:F-11:sems-1.1.0-6.fc10.src.rpm:1240163035
 sems-1_1_1-1_fc10:F-11:sems-1.1.1-1.fc10.src.rpm:1247323186
 sems-1_2_0-1_fc12:F-11:sems-1.2.0-1.fc12.src.rpm:1270129878
+sems-1_2_0-2_fc12:F-11:sems-1.2.0-2.fc12.src.rpm:1271688501

sems--0001-Adjust-CMake-files-to-reflect-actual-SEMS-version.patch:
 CMakeLists.txt |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Index: sems--0001-Adjust-CMake-files-to-reflect-actual-SEMS-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-11/sems--0001-Adjust-CMake-files-to-reflect-actual-SEMS-version.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems--0001-Adjust-CMake-files-to-reflect-actual-SEMS-version.patch	1 Apr 2010 13:51:48 -0000	1.1
+++ sems--0001-Adjust-CMake-files-to-reflect-actual-SEMS-version.patch	19 Apr 2010 14:49:35 -0000	1.2
@@ -1,7 +1,7 @@
-From 443ff1eee2d76e2152e1691bc7f0123d83f2c68d Mon Sep 17 00:00:00 2001
+From 9f7da9a864a10afe8696c50a9d182cc5eab4fd4d Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Wed, 31 Mar 2010 11:51:44 +0400
-Subject: [PATCH 01/13] Adjust CMake files to reflect actual SEMS version
+Subject: [PATCH 01/16] Adjust CMake files to reflect actual SEMS version
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---

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

Index: sems--0002-Force-to-use-system-wide-GSM-includes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-11/sems--0002-Force-to-use-system-wide-GSM-includes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems--0002-Force-to-use-system-wide-GSM-includes.patch	1 Apr 2010 13:51:48 -0000	1.1
+++ sems--0002-Force-to-use-system-wide-GSM-includes.patch	19 Apr 2010 14:49:35 -0000	1.2
@@ -1,7 +1,7 @@
-From 4daff2ce25b7f87896ede3f65d50ed04b281cd72 Mon Sep 17 00:00:00 2001
+From 17b42436f7c51bb60d8c9c9c177d8ab0632c5d20 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 02/13] Force to use system-wide GSM includes
+Subject: [PATCH 02/16] Force to use system-wide GSM includes
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov@
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/core/plug-in/gsm/gsm.c b/core/plug-in/gsm/gsm.c
-index fd63fb5..0c1e237 100644
+index 805ef78..bfc6a59 100644
 --- a/core/plug-in/gsm/gsm.c
 +++ b/core/plug-in/gsm/gsm.c
 @@ -27,7 +27,7 @@

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

Index: sems--0003-Allow-rewrite-of-custom-makefiles-by-CMake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-11/sems--0003-Allow-rewrite-of-custom-makefiles-by-CMake.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems--0003-Allow-rewrite-of-custom-makefiles-by-CMake.patch	1 Apr 2010 13:51:48 -0000	1.1
+++ sems--0003-Allow-rewrite-of-custom-makefiles-by-CMake.patch	19 Apr 2010 14:49:35 -0000	1.2
@@ -1,7 +1,7 @@
-From 7dd4d723ab58c54b6e918c3eacc78f0b877e9530 Mon Sep 17 00:00:00 2001
+From a55f5f4310092bcafefca139d7db67e053f02dfb 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 03/13] Allow rewrite of custom makefiles by CMake
+Subject: [PATCH 03/16] Allow rewrite of custom makefiles by CMake
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---

sems--0004-Relax-requirements-for-CMake-version.patch:
 CMakeLists.txt |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: sems--0004-Relax-requirements-for-CMake-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-11/sems--0004-Relax-requirements-for-CMake-version.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems--0004-Relax-requirements-for-CMake-version.patch	1 Apr 2010 13:51:49 -0000	1.1
+++ sems--0004-Relax-requirements-for-CMake-version.patch	19 Apr 2010 14:49:35 -0000	1.2
@@ -1,7 +1,7 @@
-From e4cf5961d73fda32abed0cddeb39bc58bde3e1a9 Mon Sep 17 00:00:00 2001
+From 192a502d46569dd0fdb7eeb379a24bc93b5a868c Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Wed, 31 Mar 2010 12:10:52 +0400
-Subject: [PATCH 04/13] Relax requirements for CMake version
+Subject: [PATCH 04/16] Relax requirements for CMake version
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---

sems--0005-Disable-ilbc-plugin.patch:
 CMakeLists.txt |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: sems--0005-Disable-ilbc-plugin.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-11/sems--0005-Disable-ilbc-plugin.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems--0005-Disable-ilbc-plugin.patch	1 Apr 2010 13:51:49 -0000	1.1
+++ sems--0005-Disable-ilbc-plugin.patch	19 Apr 2010 14:49:35 -0000	1.2
@@ -1,7 +1,7 @@
-From 46d4fe37bedec0bd4fbbc4e2f695ce9d911c022c Mon Sep 17 00:00:00 2001
+From 4bdf6c02ccc6cd8c29dd2da17be6421135660eb4 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Wed, 31 Mar 2010 12:19:48 +0400
-Subject: [PATCH 05/13] Disable ilbc plugin
+Subject: [PATCH 05/16] Disable ilbc plugin
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---

sems--0006-Fix-module-name-definition.patch:
 module.rules.txt |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: sems--0006-Fix-module-name-definition.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-11/sems--0006-Fix-module-name-definition.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems--0006-Fix-module-name-definition.patch	1 Apr 2010 13:51:49 -0000	1.1
+++ sems--0006-Fix-module-name-definition.patch	19 Apr 2010 14:49:35 -0000	1.2
@@ -1,7 +1,7 @@
-From 4af73128163baf0ab7034f182de0cedf6e416393 Mon Sep 17 00:00:00 2001
+From 6041b6a787562db2e9ebb065e71755c8011437c8 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Wed, 31 Mar 2010 16:08:43 +0400
-Subject: [PATCH 06/13] Fix module name definition.
+Subject: [PATCH 06/16] Fix module name definition.
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---

sems--0007-No-longer-install-SEMS-OpenSER-SER-HOWTOs.patch:
 CMakeLists.txt |    3 ---
 1 file changed, 3 deletions(-)

Index: sems--0007-No-longer-install-SEMS-OpenSER-SER-HOWTOs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-11/sems--0007-No-longer-install-SEMS-OpenSER-SER-HOWTOs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems--0007-No-longer-install-SEMS-OpenSER-SER-HOWTOs.patch	1 Apr 2010 13:51:49 -0000	1.1
+++ sems--0007-No-longer-install-SEMS-OpenSER-SER-HOWTOs.patch	19 Apr 2010 14:49:35 -0000	1.2
@@ -1,7 +1,7 @@
-From ccac93f6784d96dbe03de31e02c0d556f4adb0a1 Mon Sep 17 00:00:00 2001
+From 7f60b348709cf382d69b42f6d4d79080e321ea48 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Wed, 31 Mar 2010 16:09:48 +0400
-Subject: [PATCH 07/13] No longer install SEMS-OpenSER/SER HOWTOs
+Subject: [PATCH 07/16] No longer install SEMS-OpenSER/SER HOWTOs
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---

sems--0008-Typo.patch:
 CMakeLists.txt |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: sems--0008-Typo.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-11/sems--0008-Typo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems--0008-Typo.patch	1 Apr 2010 13:51:49 -0000	1.1
+++ sems--0008-Typo.patch	19 Apr 2010 14:49:35 -0000	1.2
@@ -1,7 +1,7 @@
-From dad7ba2e371af7eec9e95e049512fb55fa021b5f Mon Sep 17 00:00:00 2001
+From 568e9bef7bd3ddc6d780236da102dd5468a58ff3 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Wed, 31 Mar 2010 18:48:57 +0400
-Subject: [PATCH 08/13] Typo
+Subject: [PATCH 08/16] Typo
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---

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

Index: sems--0009-Set-CFG_PREFIX-to-empty-string-by-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-11/sems--0009-Set-CFG_PREFIX-to-empty-string-by-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems--0009-Set-CFG_PREFIX-to-empty-string-by-default.patch	1 Apr 2010 13:51:49 -0000	1.1
+++ sems--0009-Set-CFG_PREFIX-to-empty-string-by-default.patch	19 Apr 2010 14:49:35 -0000	1.2
@@ -1,7 +1,7 @@
-From de3a993f1cc5ee844932010feb0384721844f02a Mon Sep 17 00:00:00 2001
+From dec9c2a705e2f1c03aaeec418890cd7cafebd183 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 09/13] Set CFG_PREFIX to empty string by default
+Subject: [PATCH 09/16] Set CFG_PREFIX to empty string by default
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---

sems--0010-Fix-LAME-library-detection.patch:
 CMakeLists.txt |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Index: sems--0010-Fix-LAME-library-detection.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-11/sems--0010-Fix-LAME-library-detection.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems--0010-Fix-LAME-library-detection.patch	1 Apr 2010 13:51:49 -0000	1.1
+++ sems--0010-Fix-LAME-library-detection.patch	19 Apr 2010 14:49:35 -0000	1.2
@@ -1,7 +1,7 @@
-From f84b0860cbc5eac2a196bde7c418c7b6781a4f0b Mon Sep 17 00:00:00 2001
+From 781ac03472aa8223fffc66fad5906ca7d734f215 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Thu, 1 Apr 2010 13:54:54 +0400
-Subject: [PATCH 10/13] Fix LAME library detection
+Subject: [PATCH 10/16] Fix LAME library detection
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---

sems--0012-Add-missing-files-to-CMake-target.patch:
 CMakeLists.txt |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: sems--0012-Add-missing-files-to-CMake-target.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-11/sems--0012-Add-missing-files-to-CMake-target.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems--0012-Add-missing-files-to-CMake-target.patch	1 Apr 2010 13:51:49 -0000	1.1
+++ sems--0012-Add-missing-files-to-CMake-target.patch	19 Apr 2010 14:49:35 -0000	1.2
@@ -1,7 +1,7 @@
-From b53db68b9c06354d3745ad5e9abdc0adec67e7c7 Mon Sep 17 00:00:00 2001
+From 2e1c67dfea7e8a86a29395885156d50f5d183c48 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Thu, 1 Apr 2010 16:59:28 +0400
-Subject: [PATCH 12/13] Add missing files to CMake target
+Subject: [PATCH 12/16] Add missing files to CMake target
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---

sems--0013-Fix-for-newest-GCC.patch:
 ModMysql.cpp |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Index: sems--0013-Fix-for-newest-GCC.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-11/sems--0013-Fix-for-newest-GCC.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems--0013-Fix-for-newest-GCC.patch	1 Apr 2010 13:51:49 -0000	1.1
+++ sems--0013-Fix-for-newest-GCC.patch	19 Apr 2010 14:49:35 -0000	1.2
@@ -1,14 +1,14 @@
-From a8b16914c49361aa1263fe8d7d680e17e602f17c Mon Sep 17 00:00:00 2001
+From ad1e2e87c8c4a9dd3390ba2b4de9a64913a559a1 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Thu, 1 Apr 2010 17:09:47 +0400
-Subject: [PATCH 13/13] Fix for newest GCC
+Subject: [PATCH 13/16] Fix for newest GCC
 
 ---
  apps/dsm/mods/mod_mysql/ModMysql.cpp |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/apps/dsm/mods/mod_mysql/ModMysql.cpp b/apps/dsm/mods/mod_mysql/ModMysql.cpp
-index 46adf02..0bdacda 100644
+index 219ef20..75cdc25 100644
 --- a/apps/dsm/mods/mod_mysql/ModMysql.cpp
 +++ b/apps/dsm/mods/mod_mysql/ModMysql.cpp
 @@ -321,7 +321,7 @@ EXEC_ACTION_START(SCMyQueryGetResultAction) {


Index: sems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-11/sems.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sems.spec	1 Apr 2010 13:51:50 -0000	1.5
+++ sems.spec	19 Apr 2010 14:49:36 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:	SIP Express Media Server, an extensible SIP media server
 Name:		sems
 Version:	1.2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 URL:		http://www.iptel.org/sems
 ## wget http://ftp.iptel.org/pub/sems/1.2/1.2.0/src/sems-1.2.0.tar.gz
 ## tar zx --exclude iLBC_rfc3951 -f sems-1.2.0.tar.gz
@@ -19,7 +19,7 @@ Patch3:		sems--0003-Allow-rewrite-of-cus
 Patch4:		sems--0004-Relax-requirements-for-CMake-version.patch
 # Fedora-specific
 Patch5:		sems--0005-Disable-ilbc-plugin.patch
-# Will be proposed for inclusion in upstream
+# Applied upstream
 Patch6:		sems--0006-Fix-module-name-definition.patch
 # Applied upstream
 Patch7:		sems--0007-No-longer-install-SEMS-OpenSER-SER-HOWTOs.patch
@@ -30,11 +30,17 @@ Patch9:		sems--0009-Set-CFG_PREFIX-to-em
 # Applied upstream
 Patch10:	sems--0010-Fix-LAME-library-detection.patch
 # Applied upstream
-Patch11:	sems--0011-Add-py_sems-back.patch
+Patch11:	sems--0011-Enable-py_sems.patch
 # Applied upstream
 Patch12:	sems--0012-Add-missing-files-to-CMake-target.patch
-# Will be proposed for inclusion in upstream
+# Applied upstream
 Patch13:	sems--0013-Fix-for-newest-GCC.patch
+# RHEL-specific, partially applied upstream
+Patch14:	sems--0014-Enable-support-for-CMake-2.4.patch
+# Applied upstream
+Patch15:	sems--0015-Really-fix-compilation-with-old-SIP-tool-for-generat.patch
+# Applied upstream
+Patch16:	sems--0016-Missing-.c-module-in-adpcm-CMake-makefile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # temporary fix for https://fedorahosted.org/fedora-infrastructure/ticket/1202
 #BuildRequires:	python >= 2.3
@@ -216,6 +222,11 @@ rm -rf core/plug-in/gsm/gsm-1.0-pl10/
 %patch11 -p1 -b .enable_py_sems
 %patch12 -p1 -b .add_missing_sources
 %patch13 -p1 -b .fix_for_newest_gcc
+%if 0%{?rhel}
+%patch14 -p1 -b .fix_for_cmake_2_4
+%endif
+%patch15 -p1 -b .old_python_sip
+%patch16 -p1 -b .missing_c_source
 
 
 iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client.txt > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client.{utf8,txt}
@@ -244,9 +255,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 install -D -p -m755 pkg/rpm/sems.init $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/%{name}
 
 # Remove installed docs
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default.template.sample
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sems.conf.default
+#rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+#rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default.template.sample
+#rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sems.conf.default
 
 # remove currently empty conf-file
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/etc/conf_auth.conf
@@ -625,6 +636,9 @@ fi
 %{_libdir}/%{name}/plug-in/xmlrpc2di.so
 
 %changelog
+* Thu Apr  1 2010 Peter Lemenkov <lemenkov at gmail.com> 1.2.0-2
+- Fix for CMake 2.4 added
+
 * Wed Mar 31 2010 Peter Lemenkov <lemenkov at gmail.com> 1.2.0-1
 - Ver. 1.2.0
 - Switched to CMake (and fixed many packaging and linking issues)


--- sems--0011-Add-py_sems-back.patch DELETED ---

