rpms/sems/F-13 sems--0001-Force-to-use-system-wide-GSM-includes.patch, NONE, 1.1 sems--0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch, NONE, 1.1 sems--0003-Relax-requirements-for-CMake-version.patch, NONE, 1.1 sems--0004-Set-CFG_PREFIX-to-empty-string-by-default.patch, NONE, 1.1 sems--0005-Enable-support-for-CMake-2.4.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 import.log, 1.6, 1.7 sems.spec, 1.14, 1.15 sources, 1.4, 1.5 sems--0001-Adjust-CMake-files-to-reflect-actual-SEMS-version.patch, 1.2, NONE sems--0002-Force-to-use-system-wide-GSM-includes.patch, 1.2, NONE sems--0003-Allow-rewrite-of-custom-makefiles-by-CMake.patch, 1.2, NONE sems--0004-Relax-requirements-for-CMake-version.patch, 1.2, NONE sems--0005-Disable-ilbc-plugin.patch, 1.2, NONE sems--0006-Fix-module-name-definition.patch, 1.2, NONE sems--0007-No-longer-install-SEMS-OpenSER-SER-HOWTOs.patch, 1.2, NONE sems--0008-Typo.patch, 1.2, NONE sems--0009-Set-CFG_PREFIX-to-empty-string-by-default.patch, 1.2, NONE sems--0010-Fix-LAME-library-detection.patch, 1.2, NONE sems--0011-Enable-py_sems.patch, 1.1, NONE sems--0012-Add-missing-files-to-CMake-target.patch, 1.2, NONE sems--0013-Fix-for-newest-GCC.patch, 1.2, NONE sems--0014-Enable-support-for-CMake-2.4.patch, 1.1, NONE sems--0015-Really-fix-compilation-with-old-SIP-tool-for-generat.patch, 1.1, NONE sems--0016-Missing-.c-module-in-adpcm-CMake-makefile.patch, 1.1, NONE
Peter Lemenkov
peter at fedoraproject.org
Sat May 1 05:16:25 UTC 2010
Author: peter
Update of /cvs/pkgs/rpms/sems/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26003/F-13
Modified Files:
.cvsignore import.log sems.spec sources
Added 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
Removed Files:
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--0011-Enable-py_sems.patch
sems--0012-Add-missing-files-to-CMake-target.patch
sems--0013-Fix-for-newest-GCC.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
Log Message:
Ver. 1.2.1
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 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
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.6.6.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 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
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.6.6.1
sems--0003-Relax-requirements-for-CMake-version.patch:
CMakeLists.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE sems--0003-Relax-requirements-for-CMake-version.patch ---
>From 35cafedd848e0dbefb646f0c1c6c3f05022b3dc8 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 3/5] Relax requirements for CMake version
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..451ca32 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)
--
1.6.6.1
sems--0004-Set-CFG_PREFIX-to-empty-string-by-default.patch:
CMakeLists.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE sems--0004-Set-CFG_PREFIX-to-empty-string-by-default.patch ---
>From 0de39a6d49e6a8e412c133673acb5e10bbb7b9a7 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 4/5] 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 451ca32..0cfb538 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.6.6.1
sems--0005-Enable-support-for-CMake-2.4.patch:
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/module.rules.txt | 8 ++++++++
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 +--
9 files changed, 22 insertions(+), 24 deletions(-)
--- NEW FILE sems--0005-Enable-support-for-CMake-2.4.patch ---
>From 5a56a82411d3a7cdb1480d8d9cd51b56abd2375c 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 5/5] Enable support for CMake 2.4
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
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/module.rules.txt | 8 ++++++++
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 +-
9 files changed, 22 insertions(+), 23 deletions(-)
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/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/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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-13/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 1 Apr 2010 13:44:37 -0000 1.4
+++ .cvsignore 1 May 2010 05:16:24 -0000 1.5
@@ -1 +1 @@
-sems-1.2.0.w_o_ilbc_sources.tar.gz
+sems-1.2.1.w_o_ilbc_sources.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-13/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log 19 Apr 2010 14:46:23 -0000 1.6
+++ import.log 1 May 2010 05:16:24 -0000 1.7
@@ -4,3 +4,4 @@ sems-1_1_1-1_fc10:HEAD:sems-1.1.1-1.fc10
sems-1_1_1-6_fc11:HEAD:sems-1.1.1-6.fc11.src.rpm:1251489238
sems-1_2_0-1_fc12:F-13:sems-1.2.0-1.fc12.src.rpm:1270129447
sems-1_2_0-2_fc12:F-13:sems-1.2.0-2.fc12.src.rpm:1271688355
+sems-1_2_1-1_fc12:F-13:sems-1.2.1-1.fc12.src.rpm:1272690960
Index: sems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-13/sems.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sems.spec 19 Apr 2010 14:46:26 -0000 1.14
+++ sems.spec 1 May 2010 05:16:25 -0000 1.15
@@ -1,50 +1,26 @@
Summary: SIP Express Media Server, an extensible SIP media server
Name: sems
-Version: 1.2.0
-Release: 2%{?dist}
+Version: 1.2.1
+Release: 1%{?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
-## tar czf sems-1.2.0.w_o_ilbc_sources.tar.gz sems-1.2.0
+## 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
+## tar czf sems-1.2.1.w_o_ilbc_sources.tar.gz sems-1.2.1
Source0: %{name}-%{version}.w_o_ilbc_sources.tar.gz
License: GPLv2+
Group: Applications/Communications
-# Applied upstream
-Patch1: sems--0001-Adjust-CMake-files-to-reflect-actual-SEMS-version.patch
# Will be proposed for inclusion in upstream
-Patch2: sems--0002-Force-to-use-system-wide-GSM-includes.patch
+Patch1: sems--0001-Force-to-use-system-wide-GSM-includes.patch
# Fedora-specific
-Patch3: sems--0003-Allow-rewrite-of-custom-makefiles-by-CMake.patch
+Patch2: sems--0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch
# Will be proposed for inclusion in upstream
-Patch4: sems--0004-Relax-requirements-for-CMake-version.patch
+Patch3: sems--0003-Relax-requirements-for-CMake-version.patch
# Fedora-specific
-Patch5: sems--0005-Disable-ilbc-plugin.patch
-# Applied upstream
-Patch6: sems--0006-Fix-module-name-definition.patch
-# Applied upstream
-Patch7: sems--0007-No-longer-install-SEMS-OpenSER-SER-HOWTOs.patch
-# Applied upstream
-Patch8: sems--0008-Typo.patch
-# Fedora-specific
-Patch9: sems--0009-Set-CFG_PREFIX-to-empty-string-by-default.patch
-# Applied upstream
-Patch10: sems--0010-Fix-LAME-library-detection.patch
-# Applied upstream
-Patch11: sems--0011-Enable-py_sems.patch
-# Applied upstream
-Patch12: sems--0012-Add-missing-files-to-CMake-target.patch
-# 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
+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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# temporary fix for https://fedorahosted.org/fedora-infrastructure/ticket/1202
-#BuildRequires: python >= 2.3
-BuildRequires: python
+BuildRequires: python >= 2.3
BuildRequires: sip-devel
%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
BuildRequires: libsamplerate-devel
@@ -54,9 +30,7 @@ BuildRequires: flite-devel
BuildRequires: speex-devel
BuildRequires: mISDN-devel
BuildRequires: openssl-devel
-%if %{defined fedora}
BuildRequires: mysql++-devel
-%endif
BuildRequires: cmake >= 2.4
Requires(post): /sbin/chkconfig
Requires(preun):/sbin/chkconfig
@@ -209,24 +183,13 @@ XMLRPC servers.
%prep
%setup -q
rm -rf core/plug-in/gsm/gsm-1.0-pl10/
-%patch1 -p1 -b .sems_version
-%patch2 -p1 -b .use_system_wide_gsm
-%patch3 -p1 -b .allow_rewrite_of_makefiles
-%patch4 -p1 -b .relax_required_cmake_ver
-%patch5 -p1 -b .no_ilbc
-%patch6 -p1 -b .fix_modname
-%patch7 -p1 -b .no_longer_install_ser_howto
-%patch8 -p1 -b .typo
-%patch9 -p1 -b .cfg_prefix_to_empty_string
-%patch10 -p1 -b .lame_fix
-%patch11 -p1 -b .enable_py_sems
-%patch12 -p1 -b .add_missing_sources
-%patch13 -p1 -b .fix_for_newest_gcc
+%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}
-%patch14 -p1 -b .fix_for_cmake_2_4
+%patch5 -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}
@@ -237,9 +200,13 @@ mv ./apps/dsm/fsmc/readme.txt ./apps/ds
%{cmake} \
-DSEMS_USE_SPANDSP=yes \
-DSEMS_USE_LIBSAMPLERATE=yes \
+ -DSEMS_USE_ZRTP=NO \
+ -DSEMS_USE_MP3=NO \
+ -DSEMS_USE_ILBC=NO \
-DSEMS_USE_TTS=yes \
-DSEMS_USE_OPENSSL=yes \
-DSEMS_USE_MONITORING=yes \
+ -DSEMS_USE_IPV6=NO \
-DSEMS_CFG_PREFIX= \
-DSEMS_AUDIO_PREFIX=%{_datadir} \
-DSEMS_EXEC_PREFIX=%{_prefix} \
@@ -636,6 +603,10 @@ fi
%{_libdir}/%{name}/plug-in/xmlrpc2di.so
%changelog
+* Fri Apr 30 2010 Peter Lemenkov <lemenkov at gmail.com> 1.2.1-1
+- Ver. 1.2.1
+- Dropped upstreamed patches
+
* Thu Apr 1 2010 Peter Lemenkov <lemenkov at gmail.com> 1.2.0-2
- Fix for CMake 2.4 added
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-13/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 1 Apr 2010 13:44:39 -0000 1.4
+++ sources 1 May 2010 05:16:25 -0000 1.5
@@ -1 +1 @@
-56fae7b42d9f2ca2b111a4ee41b575fe sems-1.2.0.w_o_ilbc_sources.tar.gz
+846c02bac1f9077b213f378ffe42bc9f sems-1.2.1.w_o_ilbc_sources.tar.gz
--- sems--0001-Adjust-CMake-files-to-reflect-actual-SEMS-version.patch DELETED ---
--- sems--0002-Force-to-use-system-wide-GSM-includes.patch DELETED ---
--- sems--0003-Allow-rewrite-of-custom-makefiles-by-CMake.patch DELETED ---
--- sems--0004-Relax-requirements-for-CMake-version.patch DELETED ---
--- sems--0005-Disable-ilbc-plugin.patch DELETED ---
--- sems--0006-Fix-module-name-definition.patch DELETED ---
--- sems--0007-No-longer-install-SEMS-OpenSER-SER-HOWTOs.patch DELETED ---
--- sems--0008-Typo.patch DELETED ---
--- sems--0009-Set-CFG_PREFIX-to-empty-string-by-default.patch DELETED ---
--- sems--0010-Fix-LAME-library-detection.patch DELETED ---
--- sems--0011-Enable-py_sems.patch DELETED ---
--- sems--0012-Add-missing-files-to-CMake-target.patch DELETED ---
--- sems--0013-Fix-for-newest-GCC.patch DELETED ---
--- sems--0014-Enable-support-for-CMake-2.4.patch DELETED ---
--- sems--0015-Really-fix-compilation-with-old-SIP-tool-for-generat.patch DELETED ---
--- sems--0016-Missing-.c-module-in-adpcm-CMake-makefile.patch DELETED ---
More information about the scm-commits
mailing list