rpms/sems/EL-5 sems-0005-More-compatibility-with-older-CMake-2.4.patch, NONE, 1.1 sems-0006-Typo-paramater-parameter.patch, NONE, 1.1 sems-0007-Copy-paste-typo-this-conf-file-actually-is-a-early_a.patch, NONE, 1.1 sems-0008-Fix-MOD_NAME-passing-to-gcc.patch, NONE, 1.1 sems-0009-More-CMake-templates-for-config-files.patch, NONE, 1.1 import.log, 1.4, 1.5 sems-0001-Force-to-use-system-wide-GSM-includes.patch, 1.1, 1.2 sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch, 1.1, 1.2 sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch, 1.1, 1.2 sems-0004-Fix-for-old-python-2.4.patch, 1.1, 1.2 sems.spec, 1.5, 1.6 sems-0005-Compatibility-with-older-CMake-2.4.patch, 1.1, NONE
Peter Lemenkov
peter at fedoraproject.org
Wed Jun 2 12:57:22 UTC 2010
Author: peter
Update of /cvs/pkgs/rpms/sems/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16823/EL-5
Modified Files:
import.log
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.spec
Added Files:
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
Removed Files:
sems-0005-Compatibility-with-older-CMake-2.4.patch
Log Message:
Fixed several issues on EL-5
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 59cfa2c29e951e57f7f34bda03ecf31a8a62713a 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 5/9] 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 ---
core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt | 1 +
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 72134f6b33369e709d2bf0c3b41b959fe57f7c9c 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 6/9] 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 a72eb296ebf509c9dbe37b72d58110b11eba6840 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 7/9] 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 8906749fb93942f755ed16afbe59bab299717d4b 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 8/9] 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 a15d20779f94d0e976b7d5cc57de814db937774a 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 9/9] 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
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log 20 May 2010 11:31:20 -0000 1.4
+++ import.log 2 Jun 2010 12:57:20 -0000 1.5
@@ -2,3 +2,4 @@ sems-1_1_0-5_fc10:EL-5:sems-1.1.0-5.fc10
sems-1_1_1-1_fc10:EL-5:sems-1.1.1-1.fc10.src.rpm:1247323443
sems-1_1_1-6_fc12:EL-5:sems-1.1.1-6.fc12.src.rpm:1260363240
sems-1_2_1-2_fc12:EL-5:sems-1.2.1-2.fc12.src.rpm:1274355012
+sems-1_2_1-3_fc12:EL-5:sems-1.2.1-3.fc12.src.rpm:1275483357
sems-0001-Force-to-use-system-wide-GSM-includes.patch:
gsm.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: sems-0001-Force-to-use-system-wide-GSM-includes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/sems-0001-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-0001-Force-to-use-system-wide-GSM-includes.patch 20 May 2010 11:31:20 -0000 1.1
+++ sems-0001-Force-to-use-system-wide-GSM-includes.patch 2 Jun 2010 12:57:21 -0000 1.2
@@ -1,7 +1,7 @@
From 9cb680c4f42773cf89518a3b678d71aa7ab29661 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 1/5] Force to use system-wide GSM includes
+Subject: [PATCH 1/9] Force to use system-wide GSM includes
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index 805ef78..bfc6a59 100644
#include <stdlib.h>
--
-1.6.6.1
+1.7.0.1
sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch:
CMakeLists.txt | 10 ----------
1 file changed, 10 deletions(-)
Index: sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/sems-0002-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-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch 20 May 2010 11:31:21 -0000 1.1
+++ sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch 2 Jun 2010 12:57:21 -0000 1.2
@@ -1,7 +1,7 @@
From 702b728185a6ae9cc1c511e1c4a04839222ca8b7 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 2/5] Allow rewrite of custom makefiles by CMake
+Subject: [PATCH 2/9] Allow rewrite of custom makefiles by CMake
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -29,5 +29,5 @@ index 518b14c..c7c6e40 100644
OPTION(SEMS_USE_LIBSAMPLERATE "Build with libsamplerate" OFF)
OPTION(SEMS_USE_ZRTP "Build with ZRTP" OFF)
--
-1.6.6.1
+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(-)
Index: sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/sems-0003-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-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch 20 May 2010 11:31:21 -0000 1.1
+++ sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch 2 Jun 2010 12:57:21 -0000 1.2
@@ -1,7 +1,7 @@
From 925e57b57d82c4b1813b1bb41faf23380e21d736 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 3/5] Set CFG_PREFIX to empty string by default
+Subject: [PATCH 3/9] Set CFG_PREFIX to empty string by default
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index c7c6e40..e0d749a 100644
MESSAGE(STATUS "SEMS cfg prefix was set to: ${SEMS_CFG_PREFIX}")
--
-1.6.6.1
+1.7.0.1
sems-0004-Fix-for-old-python-2.4.patch:
Ivr.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: sems-0004-Fix-for-old-python-2.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/sems-0004-Fix-for-old-python-2.4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems-0004-Fix-for-old-python-2.4.patch 20 May 2010 11:31:21 -0000 1.1
+++ sems-0004-Fix-for-old-python-2.4.patch 2 Jun 2010 12:57:21 -0000 1.2
@@ -1,7 +1,7 @@
-From a09ad947b38446e2c7b3389b4ede87de1d8707a0 Mon Sep 17 00:00:00 2001
+From 99f3df0d7e1b9f0d622c587149912e3c98a17c8c 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 4/5] Fix for old python 2.4
+Subject: [PATCH 4/9] Fix for old python 2.4
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index f4ed59f..1a0dccb 100644
void IvrFactory::import_ivr_builtins()
--
-1.6.6.1
+1.7.0.1
Index: sems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/sems.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sems.spec 20 May 2010 11:31:21 -0000 1.5
+++ sems.spec 2 Jun 2010 12:57:22 -0000 1.6
@@ -1,7 +1,7 @@
Summary: SIP Express Media Server, an extensible SIP media server
Name: sems
Version: 1.2.1
-Release: 2%{?dist}
+Release: 3%{?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
@@ -18,7 +18,15 @@ Patch3: sems-0003-Set-CFG_PREFIX-to-emp
# RHEL-specific
Patch4: sems-0004-Fix-for-old-python-2.4.patch
# RHEL-specific, partially applied upstream
-Patch5: sems-0005-Compatibility-with-older-CMake-2.4.patch
+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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python >= 2.3
BuildRequires: sip-devel
@@ -190,6 +198,10 @@ rm -rf core/plug-in/gsm/gsm-1.0-pl10/
%patch4 -p1 -b .support_for_python_2_4
%patch5 -p1 -b .support_for_cmake_2_4
%endif
+%patch6 -p1 -b .typo
+%patch7 -p1 -b .another_typo
+%patch8 -p1 -b .fix_mod_name
+%patch9 -p1 -b .more_cmake_templates
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 +615,11 @@ fi
%{_libdir}/%{name}/plug-in/xmlrpc2di.so
%changelog
+* 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
--- sems-0005-Compatibility-with-older-CMake-2.4.patch DELETED ---
More information about the scm-commits
mailing list