Thu Apr 1 13:44:39 UTC 2010

Author: peter

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

Modified Files:
	.cvsignore import.log sems.spec sources 
Added 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-Add-py_sems-back.patch 
	sems--0012-Add-missing-files-to-CMake-target.patch 
	sems--0013-Fix-for-newest-GCC.patch 
Removed Files:
	sems--external_gsm_lib.diff 
	sems--flite-hardcoded-path-removal.diff sems--gcc44.diff 
	sems--makefile_defs_removal.diff sems--openssl10.diff 
	sems--py_sources_install.diff sems--spandsp_0_0_6_fix.diff 
	sems--xmlrpc++-use_fedora_cxxflags.diff 
Log Message:
Ver. 1.2.0

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

--- NEW FILE sems--0001-Adjust-CMake-files-to-reflect-actual-SEMS-version.patch ---
>From 443ff1eee2d76e2152e1691bc7f0123d83f2c68d 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

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c69432b..d8f2c43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,11 +3,11 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT (SEMS)
 
 SET(SEMS_MAJOR_VERSION 1)
-SET(SEMS_MINOR_VERSION 1)
-SET(SEMS_BUILD_VERSION 1)
+SET(SEMS_MINOR_VERSION 2)
+SET(SEMS_BUILD_VERSION 0)
 SET(SEMS_EXTRA_VERSION dev)
 SET(SEMS_VERSION
-    "${SEMS_MAJOR_VERSION}.${SEMS_MINOR_VERSION}.${SEMS_BUILD_VERSION}-${SEMS_EXTRA_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.
-- 
1.6.6.1


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

--- NEW FILE sems--0002-Force-to-use-system-wide-GSM-includes.patch ---
>From 4daff2ce25b7f87896ede3f65d50ed04b281cd72 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

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 fd63fb5..0c1e237 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--0003-Allow-rewrite-of-custom-makefiles-by-CMake.patch:
 CMakeLists.txt |   10 ----------
 1 file changed, 10 deletions(-)

--- NEW FILE sems--0003-Allow-rewrite-of-custom-makefiles-by-CMake.patch ---
>From 7dd4d723ab58c54b6e918c3eacc78f0b877e9530 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

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 d8f2c43..8e250e4 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--0004-Relax-requirements-for-CMake-version.patch:
 CMakeLists.txt |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE sems--0004-Relax-requirements-for-CMake-version.patch ---
>From e4cf5961d73fda32abed0cddeb39bc58bde3e1a9 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

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 8e250e4..1f1e41b 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--0005-Disable-ilbc-plugin.patch:
 CMakeLists.txt |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE sems--0005-Disable-ilbc-plugin.patch ---
>From 46d4fe37bedec0bd4fbbc4e2f695ce9d911c022c 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

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

diff --git a/core/plug-in/CMakeLists.txt b/core/plug-in/CMakeLists.txt
index 8fc0281..8ba89bc 100644
--- a/core/plug-in/CMakeLists.txt
+++ b/core/plug-in/CMakeLists.txt
@@ -7,7 +7,7 @@ ENDIF(SEMS_USE_SPANDSP)
 IF(GSM_FOUND)
 	ADD_SUBDIRECTORY (gsm)
 ENDIF(GSM_FOUND)
-ADD_SUBDIRECTORY (ilbc)
+#ADD_SUBDIRECTORY (ilbc)
 ADD_SUBDIRECTORY (l16)
 ADD_SUBDIRECTORY (session_timer)
 ADD_SUBDIRECTORY (sipctrl)
-- 
1.6.6.1


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

--- NEW FILE sems--0006-Fix-module-name-definition.patch ---
>From 4af73128163baf0ab7034f182de0cedf6e416393 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.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
 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 f43becb..80ec94e 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.6.6.1


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

--- NEW FILE sems--0007-No-longer-install-SEMS-OpenSER-SER-HOWTOs.patch ---
>From ccac93f6784d96dbe03de31e02c0d556f4adb0a1 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

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

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 785f9fa..7459f45 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -98,8 +98,6 @@ SET(doc_files
 	../doc/CHANGELOG
 	../doc/COMPILING
 	../doc/COPYING
-	../doc/Configure-Sems-OpenSER-HOWTO
-	../doc/Configure-Sems-Ser-HOWTO
 	../doc/Makefile
 	../doc/Readme.ann_b2b.txt
 	../doc/Readme.announce_transfer.txt
-- 
1.6.6.1


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

--- NEW FILE sems--0008-Typo.patch ---
>From dad7ba2e371af7eec9e95e049512fb55fa021b5f 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

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

diff --git a/apps/annrecorder/CMakeLists.txt b/apps/annrecorder/CMakeLists.txt
index 3560e8a..548071f 100644
--- a/apps/annrecorder/CMakeLists.txt
+++ b/apps/annrecorder/CMakeLists.txt
@@ -2,7 +2,7 @@ set (annrecorder_SRCS
 AnnRecorder.cpp
 )
 
-set (audio_filenames
+set (audio_files
 beep.wav
 bye.wav
 confirm.wav
-- 
1.6.6.1


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

--- NEW FILE sems--0009-Set-CFG_PREFIX-to-empty-string-by-default.patch ---
>From de3a993f1cc5ee844932010feb0384721844f02a 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

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 1f1e41b..d3a8a39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,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--0010-Fix-LAME-library-detection.patch:
 CMakeLists.txt |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE sems--0010-Fix-LAME-library-detection.patch ---
>From f84b0860cbc5eac2a196bde7c418c7b6781a4f0b 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

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3a8a39..97da195 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,22 +102,22 @@ ELSE(SEMS_USE_ZRTP)
 ENDIF(SEMS_USE_ZRTP)
 
 # Lame MP3 support
-IF(SEMS_USE_LAME)
+IF(SEMS_USE_MP3)
 	FIND_LIBRARY(LAME_LIBRARIES NAMES mp3lame)
-	FIND_PATH(LAME_INCLUDE_DIR lame.h)
+	FIND_PATH(LAME_INCLUDE_DIR lame/lame.h)
 	IF(LAME_INCLUDE_DIR AND LAME_LIBRARIES)
 		SET(LAME_FOUND TRUE)
-		MESSAGE(STATUS "Found lame mp3 includes: ${LAME_INCLUDE_DIR}/lame.h")
+		MESSAGE(STATUS "Found lame mp3 includes: ${LAME_INCLUDE_DIR}/lame/lame.h")
 		MESSAGE(STATUS "Found lame mp3 library: ${LAME_LIBRARIES}")
 		MESSAGE(STATUS "Using lame mp3: YES")
 	ELSE(LAME_INCLUDE_DIR AND LAME_LIBRARIES)
 		SET(LAME_FOUND FALSE)
 		MESSAGE(FATAL_ERROR "Could NOT find lame development files")
 	ENDIF(LAME_INCLUDE_DIR AND LAME_LIBRARIES)
-ELSE(SEMS_USE_LAME)
+ELSE(SEMS_USE_MP3)
 	SET(LAME_FOUND FALSE)
 	MESSAGE(STATUS "Using lame mp3: NO (default)")
-ENDIF(SEMS_USE_LAME)
+ENDIF(SEMS_USE_MP3)
 
 # build in support for monitoring?
 IF(SEMS_USE_MONITORING)
-- 
1.6.6.1


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

--- NEW FILE sems--0011-Add-py_sems-back.patch ---
>From 8824dd67189dec8226e1b698bcfc789887996881 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/11] Add py_sems back

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--0012-Add-missing-files-to-CMake-target.patch:
 CMakeLists.txt |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE sems--0012-Add-missing-files-to-CMake-target.patch ---
>From b53db68b9c06354d3745ad5e9abdc0adec67e7c7 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

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

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 7459f45..9f49f8e 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -5,6 +5,7 @@ SET (sems_SRCS
  AmAudio.cpp
  AmAudioFile.cpp
  AmAudioMixIn.cpp
+ AmAudioMixer.cpp
  AmB2ABSession.cpp
  AmB2BSession.cpp
  AmBufferedAudio.cpp
@@ -35,11 +36,13 @@ SET (sems_SRCS
  AmServer.cpp
  AmSession.cpp
  AmSessionContainer.cpp
+ AmSessionEventHandler.cpp
  AmSipDialog.cpp
  AmSipDispatcher.cpp
  AmSipMsg.cpp
  AmThread.cpp
  AmUAC.cpp
+ AmUriParser.cpp
  AmUtils.cpp
  AmZRTP.cpp
  LowcFE.cpp
-- 
1.6.6.1


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

--- NEW FILE sems--0013-Fix-for-newest-GCC.patch ---
>From a8b16914c49361aa1263fe8d7d680e17e602f17c 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

---
 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
--- a/apps/dsm/mods/mod_mysql/ModMysql.cpp
+++ b/apps/dsm/mods/mod_mysql/ModMysql.cpp
@@ -321,7 +321,7 @@ EXEC_ACTION_START(SCMyQueryGetResultAction) {
     mysqlpp::Query query = conn->query(qstr.c_str());
     mysqlpp::StoreQueryResult res = query.store();    
     if (res) {
-      size_t rowindex_i = 0;
+      unsigned int rowindex_i = 0;
       string rowindex = resolveVars(par2, sess, sc_sess, event_params);
       if (rowindex.length()) {
 	if (str2i(rowindex, rowindex_i)) {
@@ -369,7 +369,7 @@ EXEC_ACTION_START(SCMyGetResultAction) {
     return false;
   }
 
-  size_t rowindex_i = 0;
+  unsigned int rowindex_i = 0;
   string rowindex = resolveVars(par1, sess, sc_sess, event_params);
   string colname  = resolveVars(par2, sess, sc_sess, event_params);
 
-- 
1.6.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Jul 2009 14:38:50 -0000	1.3
+++ .cvsignore	1 Apr 2010 13:44:37 -0000	1.4
@@ -1 +1 @@
-sems-1.1.1.w_o_ilbc_sources.tar.gz
+sems-1.2.0.w_o_ilbc_sources.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-13/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	28 Aug 2009 19:56:05 -0000	1.4
+++ import.log	1 Apr 2010 13:44:38 -0000	1.5
@@ -2,3 +2,4 @@ sems-1_1_0-5_fc10:HEAD:sems-1.1.0-5.fc10
 sems-1_1_0-6_fc10:HEAD:sems-1.1.0-6.fc10.src.rpm:1240162624
 sems-1_1_1-1_fc10:HEAD:sems-1.1.1-1.fc10.src.rpm:1247323064
 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


Index: sems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-13/sems.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sems.spec	16 Nov 2009 21:03:17 -0000	1.12
+++ sems.spec	1 Apr 2010 13:44:39 -0000	1.13
@@ -1,46 +1,57 @@
 Summary:	SIP Express Media Server, an extensible SIP media server
 Name:		sems
-Version:	1.1.1
-Release:	7%{?dist}
+Version:	1.2.0
+Release:	1%{?dist}
 URL:		http://www.iptel.org/sems
-# wget http://ftp.iptel.org/pub/sems/sems-1.1.1.tar.gz
-# tar zx --exclude iLBC_rfc3951 -f sems-1.1.1.tar.gz
-# tar czf sems-1.1.1.w_o_ilbc_sources.tar.gz sems-1.1.1
-Source0:	sems-1.1.1.w_o_ilbc_sources.tar.gz
+## 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
+Source0:	%{name}-%{version}.w_o_ilbc_sources.tar.gz
 License:	GPLv2+
 Group:		Applications/Communications
-# Use external gsm instead of shipped one
-Patch2:		sems--external_gsm_lib.diff
-# Remove hardcoded path to search for flite includes
-Patch3:		sems--flite-hardcoded-path-removal.diff
-# install also *.py (not only *.pyc) files
-Patch4:		sems--py_sources_install.diff
-# module apps/xmlrpc2di uses custoimized version of xmlrpc++ library
-Patch5:		sems--xmlrpc++-use_fedora_cxxflags.diff
-# Get rid of stupid makefile_defs condition in Makefile.defs
-# which prevents uf from successful building on some Fedora releases
-Patch6:		sems--makefile_defs_removal.diff
-# GCC 4.4 fixes
-Patch7:		sems--gcc44.diff
-# spandsp 0.0.6pre fixes
-Patch8:		sems--spandsp_0_0_6_fix.diff
-# openssl 1.0 patch
-Patch9:		sems--openssl10.diff
+# 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
+# Fedora-specific
+Patch3:		sems--0003-Allow-rewrite-of-custom-makefiles-by-CMake.patch
+# Will be proposed for inclusion in upstream
+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
+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-Add-py_sems-back.patch
+# Applied upstream
+Patch12:	sems--0012-Add-missing-files-to-CMake-target.patch
+# Will be proposed for inclusion in upstream
+Patch13:	sems--0013-Fix-for-newest-GCC.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
-# re-enable when/if building -python subpkg
-#BuildRequires: sip-devel
-#{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
+BuildRequires: sip-devel
+%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
 BuildRequires:	libsamplerate-devel
 BuildRequires:	gsm-devel
 BuildRequires:	spandsp-devel
-# TODO consider enabling flite support in apps/conference
 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
 Requires(preun):/sbin/service
@@ -49,7 +60,7 @@ Requires(preun):/sbin/service
 SEMS (SIP Express Media Server) is very extensible and programmable
 SIP media server for SER or OpenSER. The plug-in based SDK enables
 you to extend SEMS and write your own applications and integrate new
-codec. Voicemail, announcement and echo plug-ins are already included.
+codec. Voice-mail, announcement and echo plug-ins are already included.
 SEMS supports g711u, g711a, GSM06.10 and wav file.
 
 %package	conf_auth
@@ -61,6 +72,15 @@ Requires:	%{name}-ivr = %{version}-%{rel
 %description	conf_auth
 Conference with authorization by PIN-numbers.
 
+%package	conference
+Summary:	Conferencing application
+Group:		Applications/Communications
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	%{name} < 1.2.0
+
+%description	conference
+Conferencing application for SEMS.
+
 %package	diameter_client
 Summary:	A simple DIAMETER client implementation
 Group:		Applications/Communications
@@ -75,6 +95,28 @@ It is used from other modules with the D
 can execute DI functions to add a server connection, or send a
 DIAMETER request.
 
+%package	dsm
+Summary:	The state machine interpreter for SEMS
+Group:		Applications/Communications
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	%{name} < 1.2.0
+
+%description	dsm
+DonkeySM is a state machine interpreter for SEMS. Application
+or service logic can comfortably and accurately be defined
+as state machine, in a simple textual state machine definition
+language, and executed by the dsm module as application in SEMS.
+
+%package	early_announce
+Summary:	Early announce application
+Group:		Applications/Communications
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	%{name} < 1.2.0
+
+%description	early_announce
+Early annonce application for SEMS.
+
+
 %package	g722
 Summary:	G.722 support for SEMS
 Group:		Applications/Communications
@@ -117,7 +159,7 @@ Requires:	%{name}-ivr = %{version}-%{rel
 %description	mailbox
 The mailbox application is a mailbox where callers can leave messages
 for offline or unavailable users and the users can dial in to check their
-messages. It uses an IMAP server as backend to store the voice messages.
+messages. It uses an IMAP server as back-end to store the voice messages.
 
 %package	pin_collect
 Summary:	Collects a PIN
@@ -129,14 +171,14 @@ Requires:	%{name}-ivr = %{version}-%{rel
 This application collects a PIN and then transfers using a
 (proprietary) REFER the call.
 
-#%package	python
-#Summary:	Python bindings for SEMS
-#Group:		Applications/Communications
-#Requires:	python >= 2.3
-#Requires:	%{name} = %{version}-%{release}
+%package	python
+Summary:	Python bindings for SEMS
+Group:		Applications/Communications
+Requires:	python >= 2.3
+Requires:	%{name} = %{version}-%{release}
 
-#%description	python
-#Python bindings for SEMS.
+%description	python
+Python bindings for SEMS.
 
 %package	speex
 Summary:	Speex support for SEMS
@@ -153,7 +195,7 @@ Requires:	%{name} = %{version}-%{release
 
 %description	xmlrpc2di
 This module makes the Dynamic Invocation (DI) Interfaces exported
-by component modules accessible from XMLRPC. Additionally the builtin
+by component modules accessible from XMLRPC. Additionally the built-in
 methods calls, get_loglevel and set_loglevel are implemented (like in the
 stats UDP server). Additionally, it can be used as client to access
 XMLRPC servers.
@@ -161,49 +203,47 @@ XMLRPC servers.
 %prep
 %setup -q
 rm -rf core/plug-in/gsm/gsm-1.0-pl10/
-%patch2 -p0 -b .gsm_ext
-%patch3 -p0 -b .flite_hardcoded
-%patch4 -p0 -b .py_install_also
-%patch5 -p0 -b .cxxflags
-%patch6 -p0 -b .makefile_defs_removal
-%patch7 -p0 -b .gcc44
-%patch8 -p0 -b .spandsp_new
-%patch9 -p0 -b .openssl10
+%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
 
-iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client{.utf8,}
-iconv -f iso8859-1 -t UTF-8 doc/Readme.voicebox > doc/Readme.voicebox.utf8 && mv doc/Readme.voicebox{.utf8,}
+
+iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client.txt > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client.{utf8,txt}
+iconv -f iso8859-1 -t UTF-8 doc/Readme.voicebox.txt > doc/Readme.voicebox.utf8 && mv doc/Readme.voicebox.{utf8,txt}
 mv ./apps/dsm/fsmc/readme.txt  ./apps/dsm/fsmc/Readme.fsmc.txt
 
 %build
-export CPPFLAGS="-D_REENTRANT -DSEMS_VERSION='\"%{version}\"' -DARCH='\"%{_arch}\"' -DOS='\"linux\"' -DSPANDSP_EXPOSE_INTERNAL_STRUCTURES -DUSE_SPANDSP -D__STDC_LIMIT_MACROS -DUSE_LIBSAMPLERATE -Wall -Wno-reorder -fPIC -g"
-export CXXFLAGS="-Wno-reorder -fPIC $RPM_OPT_FLAGS"
-export CFLAGS="-Wno-reorder -fPIC $RPM_OPT_FLAGS"
-make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" all
+%{cmake} \
+	-DSEMS_USE_SPANDSP=yes \
+	-DSEMS_USE_LIBSAMPLERATE=yes \
+	-DSEMS_USE_TTS=yes \
+	-DSEMS_USE_OPENSSL=yes \
+	-DSEMS_USE_MONITORING=yes \
+	-DSEMS_CFG_PREFIX= \
+	-DSEMS_AUDIO_PREFIX=%{_datadir} \
+	-DSEMS_EXEC_PREFIX=%{_prefix} \
+	-DSEMS_LIBDIR=%{_lib} \
+	-DSEMS_DOC_PREFIX=%{_docdir}
+
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" \
-	DESTDIR=$RPM_BUILD_ROOT \
-	basedir= \
-	prefix=%{_prefix} \
-	modules-prefix= \
-	modules-dir=%{_libdir}/%{name}/plug-in \
-	modules-target=%{_libdir}/%{name}/plug-in \
-	lib-prefix= \
-	lib-dir=%{_libdir}/%{name}/ \
-	lib-target=%{_libdir}/%{name}/ \
-	ivr-modules-dir=%{_libdir}/%{name}/ivr \
-	cfg-prefix= \
-	cfg-target=%{_sysconfdir}/%{name}/ \
-	doc-prefix= \
-	doc-dir=%{_docdir}/%{name}/ \
-	audio-prefix= \
-	audio-dir=%{_datadir}/%{name}/audio/ \
-	audio-target=%{_datadir}/%{name}/audio/
+make install DESTDIR=$RPM_BUILD_ROOT
 
 install -D -p -m755 pkg/rpm/sems.init $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/%{name}
 
-# Remove installed README
+# 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
@@ -211,10 +251,13 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{n
 # remove currently empty conf-file
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/etc/conf_auth.conf
 
-# fix permissions
-chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/log.py*
-#chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/py_sems_log.py*
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/etc/py_sems.conf
+# add empty directories for audiofiles
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/audio/ann_b2b
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/audio/announcement
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/audio/announce_transfer
+
+# install template file for voicemail
+install -D -p -m 644 apps/voicemail/default.template $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default.template
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -230,6 +273,7 @@ if [ $1 -eq 0 ]; then
 	/sbin/chkconfig --del sems || :
 fi
 
+
 %files
 %defattr(-,root,root)
 
@@ -242,11 +286,10 @@ fi
 %dir %{_datadir}/%{name}/audio/announcement
 %dir %{_datadir}/%{name}/audio/announce_transfer
 %dir %{_datadir}/%{name}/audio/annrecorder
-%dir %{_datadir}/%{name}/audio/conference
+%dir %{_datadir}/%{name}/audio/precoded_announce
 %dir %{_datadir}/%{name}/audio/voicebox
 %dir %{_datadir}/%{name}/audio/voicemail
 %dir %{_datadir}/%{name}/audio/webconference
-%dir %{_libdir}/%{name}/dsm
 %dir %{_libdir}/%{name}/plug-in
 
 %{_sysconfdir}/init.d/%{name}
@@ -258,67 +301,62 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/etc/announcement.conf
 %config(noreplace) %{_sysconfdir}/%{name}/etc/annrecorder.conf
 %config(noreplace) %{_sysconfdir}/%{name}/etc/app_mapping.conf
+%config(noreplace) %{_sysconfdir}/%{name}/etc/auth_b2b.conf
 %config(noreplace) %{_sysconfdir}/%{name}/etc/binrpcctrl.conf
 %config(noreplace) %{_sysconfdir}/%{name}/etc/call_timer.conf
 %config(noreplace) %{_sysconfdir}/%{name}/etc/callback.conf
 %config(noreplace) %{_sysconfdir}/%{name}/etc/click2dial.conf
-%config(noreplace) %{_sysconfdir}/%{name}/etc/conference.conf
-%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm.conf
-%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm_in_prompts.conf
-%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm_out_prompts.conf
-%config(noreplace) %{_sysconfdir}/%{name}/etc/early_announce.conf
+%config(noreplace) %{_sysconfdir}/%{name}/etc/echo.conf
+%config(noreplace) %{_sysconfdir}/%{name}/etc/monitoring.conf
 %config(noreplace) %{_sysconfdir}/%{name}/etc/msg_storage.conf
 %config(noreplace) %{_sysconfdir}/%{name}/etc/precoded_announce.conf
 %config(noreplace) %{_sysconfdir}/%{name}/etc/reg_agent.conf
 %config(noreplace) %{_sysconfdir}/%{name}/etc/sipctrl.conf
 %config(noreplace) %{_sysconfdir}/%{name}/etc/stats.conf
 %config(noreplace) %{_sysconfdir}/%{name}/etc/sw_prepaid_sip.conf
-%config(noreplace) %{_sysconfdir}/%{name}/etc/unixsockctrl.conf
 %config(noreplace) %{_sysconfdir}/%{name}/etc/voicebox.conf
 %config(noreplace) %{_sysconfdir}/%{name}/etc/voicemail.conf
 %config(noreplace) %{_sysconfdir}/%{name}/etc/webconference.conf
 
 %doc README
-%doc apps/dsm/doc/Readme.dsm.txt
-%doc apps/dsm/mods/mod_dlg/Readme.mod_dlg.txt
-%doc apps/dsm/mods/mod_sys/Readme.mod_sys.txt
-%doc apps/dsm/mods/mod_uri/Readme.mod_uri.txt
-%doc apps/dsm/fsmc/Readme.fsmc.txt
-%doc apps/examples/tutorial/cc_acc/Readme.cc_acc
 %doc core/plug-in/adpcm/README_G711
 %doc core/plug-in/stats/README.stats
 %doc doc/figures
+%doc doc/Howtostart_noproxy.txt
+%doc doc/Howtostart_simpleproxy.txt
+%doc doc/Howtostart_voicemail.txt
 %doc doc/CHANGELOG
 %doc doc/COPYING
-%doc doc/Configure-Sems-OpenSER-HOWTO
-%doc doc/Configure-Sems-Ser-HOWTO
-%doc doc/Readme.ann_b2b
-%doc doc/Readme.announce_transfer
-%doc doc/Readme.announcement
-%doc doc/Readme.annrecorder
-%doc doc/Readme.auth_b2b
-%doc doc/Readme.call_timer
-%doc doc/Readme.callback
-%doc doc/Readme.click2dial
-%doc doc/Readme.conf_auth
-%doc doc/Readme.conference
-%doc doc/Readme.early_announce
-%doc doc/Readme.echo
+%doc doc/Readme.ann_b2b.txt
+%doc doc/Readme.announce_transfer.txt
+%doc doc/Readme.announcement.txt
+%doc doc/Readme.annrecorder.txt
+%doc doc/Readme.auth_b2b.txt
+%doc doc/Readme.call_timer.txt
+%doc doc/Readme.callback.txt
+%doc doc/Readme.click2dial.txt
+%doc doc/Readme.conf_auth.txt
+%doc doc/Readme.echo.txt
 %if 0%{?with_ilbc}
-%doc doc/Readme.iLBC
+%doc doc/Readme.iLBC.txt
 %endif
+%doc doc/Readme.monitoring.txt
 %if 0%{?with_mp3}
-%doc doc/Readme.mp3plugin
+%doc doc/Readme.mp3plugin.txt
 %endif
-%doc doc/Readme.msg_storage
-%doc doc/Readme.reg_agent
-%doc doc/Readme.registrar_client
-%doc doc/Readme.sw_prepaid_sip
-%doc doc/Readme.uac_auth
-%doc doc/Readme.voicebox
-%doc doc/Readme.voicemail
-%doc doc/Readme.webconference
+%doc doc/Readme.msg_storage.txt
+%doc doc/Readme.py_sems.txt
+%doc doc/Readme.reg_agent.txt
+%doc doc/Readme.registrar_client.txt
+%doc doc/Readme.sw_prepaid_sip.txt
+%doc doc/Readme.twit.txt
+%doc doc/Readme.uac_auth.txt
+%doc doc/Readme.voicebox.txt
+%doc doc/Readme.voicemail.txt
+%doc doc/Readme.webconference.txt
 %doc doc/WHATSNEW_0.10
+%doc doc/Tuning.txt
+#%doc doc/ZRTP.txt
 
 %{_sbindir}/%{name}
 %{_sbindir}/%{name}-stats
@@ -332,8 +370,7 @@ fi
 %{_datadir}/%{name}/audio/annrecorder/to_record.wav
 %{_datadir}/%{name}/audio/annrecorder/welcome.wav
 %{_datadir}/%{name}/audio/annrecorder/your_prompt.wav
-%{_datadir}/%{name}/audio/conference/beep.wav
-%{_datadir}/%{name}/audio/conference/first_participant.wav
+%{_datadir}/%{name}/audio/precoded_announce/test.predef
 %{_datadir}/%{name}/audio/voicebox/0.wav
 %{_datadir}/%{name}/audio/voicebox/1.wav
 %{_datadir}/%{name}/audio/voicebox/10.wav
@@ -408,12 +445,6 @@ fi
 %{_datadir}/%{name}/audio/webconference/pin_prompt.wav
 %{_datadir}/%{name}/audio/webconference/wrong_pin.wav
 
-%{_libdir}/%{name}/dsm/mod_dlg.so
-%{_libdir}/%{name}/dsm/mod_sys.so
-%{_libdir}/%{name}/dsm/mod_uri.so
-%{_libdir}/%{name}/dsm/inbound_call.dsm
-%{_libdir}/%{name}/dsm/outbound_call.dsm
-
 %{_libdir}/%{name}/plug-in/adpcm.so
 %{_libdir}/%{name}/plug-in/ann_b2b.so
 %{_libdir}/%{name}/plug-in/announce_transfer.so
@@ -423,16 +454,13 @@ fi
 %{_libdir}/%{name}/plug-in/binrpcctrl.so
 %{_libdir}/%{name}/plug-in/call_timer.so
 %{_libdir}/%{name}/plug-in/callback.so
-%{_libdir}/%{name}/plug-in/cc_acc.so
 %{_libdir}/%{name}/plug-in/click2dial.so
-%{_libdir}/%{name}/plug-in/conference.so
-%{_libdir}/%{name}/plug-in/dsm.so
-%{_libdir}/%{name}/plug-in/early_announce.so
 %{_libdir}/%{name}/plug-in/echo.so
 %if 0%{?with_ilbc}
 %{_libdir}/%{name}/plug-in/ilbc.so
 %endif
 %{_libdir}/%{name}/plug-in/l16.so
+%{_libdir}/%{name}/plug-in/monitoring.so
 %{_libdir}/%{name}/plug-in/msg_storage.so
 %{_libdir}/%{name}/plug-in/precoded_announce.so
 %{_libdir}/%{name}/plug-in/reg_agent.so
@@ -442,7 +470,6 @@ fi
 %{_libdir}/%{name}/plug-in/stats.so
 %{_libdir}/%{name}/plug-in/sw_prepaid_sip.so
 %{_libdir}/%{name}/plug-in/uac_auth.so
-%{_libdir}/%{name}/plug-in/unixsockctrl.so
 %{_libdir}/%{name}/plug-in/voicebox.so
 %{_libdir}/%{name}/plug-in/voicemail.so
 %{_libdir}/%{name}/plug-in/wav.so
@@ -452,16 +479,61 @@ fi
 %defattr(-,root,root)
 # currently empty
 #%config(noreplace) %{_sysconfdir}/%{name}/etc/conf_auth.conf
-%doc doc/Readme.conf_auth
+%doc doc/Readme.conf_auth.txt
 %{_libdir}/%{name}/ivr/conf_auth.py
 %{_libdir}/%{name}/ivr/conf_auth.pyc
 %{_libdir}/%{name}/ivr/conf_auth.pyo
 
+%files conference
+%defattr(-,root,root)
+%config(noreplace) %{_sysconfdir}/%{name}/etc/conference.conf
+%doc doc/Readme.conference.txt
+%dir %{_datadir}/%{name}/audio/conference
+%{_libdir}/%{name}/plug-in/conference.so
+%{_datadir}/%{name}/audio/conference/beep.wav
+%{_datadir}/%{name}/audio/conference/first_participant.wav
+
 %files diameter_client
 %defattr(-,root,root)
-%doc doc/Readme.diameter_client
+%doc doc/Readme.diameter_client.txt
 %{_libdir}/%{name}/plug-in/diameter_client.so
 
+%files dsm
+%defattr(-,root,root)
+%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm.conf
+%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm_in_prompts.conf
+%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm_out_prompts.conf
+%doc apps/dsm/mods/mod_aws/Readme.mod_aws.txt
+%doc apps/dsm/mods/mod_conference/Readme.mod_conference.txt
+%doc apps/dsm/mods/mod_dlg/Readme.mod_dlg.txt
+%doc apps/dsm/mods/mod_monitoring/Readme.mod_monitoring.txt
+%doc apps/dsm/mods/mod_mysql/Readme.mod_mysqlpp.txt
+%doc apps/dsm/mods/mod_py/Readme.mod_py.txt
+%doc apps/dsm/mods/mod_sys/Readme.mod_sys.txt
+%doc apps/dsm/mods/mod_uri/Readme.mod_uri.txt
+%doc apps/dsm/mods/mod_utils/Readme.mod_utils.txt
+%doc apps/dsm/fsmc/Readme.fsmc.txt
+%doc doc/dsm
+%dir %{_libdir}/%{name}/dsm
+%{_libdir}/%{name}/dsm/mod_dlg.so
+%{_libdir}/%{name}/dsm/mod_conference.so
+%{_libdir}/%{name}/dsm/mod_monitoring.so
+%{_libdir}/%{name}/dsm/mod_mysql.so
+%{_libdir}/%{name}/dsm/mod_py.so
+%{_libdir}/%{name}/dsm/mod_sys.so
+%{_libdir}/%{name}/dsm/mod_uri.so
+%{_libdir}/%{name}/dsm/mod_utils.so
+%{_libdir}/%{name}/dsm/inbound_call.dsm
+%{_libdir}/%{name}/dsm/outbound_call.dsm
+%{_libdir}/%{name}/plug-in/dsm.so
+
+
+%files early_announce
+%defattr(-,root,root)
+%config(noreplace) %{_sysconfdir}/%{name}/etc/early_announce.conf
+%doc doc/Readme.early_announce.txt
+%{_libdir}/%{name}/plug-in/early_announce.so
+
 %files g722
 %defattr(-,root,root)
 %doc core/plug-in/g722/Readme.g722codec
@@ -479,18 +551,18 @@ fi
 %files ivr
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/%{name}/etc/ivr.conf
-%doc doc/Readme.ivr
+%doc doc/Readme.ivr.txt
 %dir %{_libdir}/%{name}/ivr
 %{_libdir}/%{name}/plug-in/ivr.so
-%{_libdir}/%{name}/plug-in/log.py
-%{_libdir}/%{name}/plug-in/log.pyc
-%{_libdir}/%{name}/plug-in/log.pyo
+%{_libdir}/%{name}/ivr/log.py
+%{_libdir}/%{name}/ivr/log.pyc
+%{_libdir}/%{name}/ivr/log.pyo
 
 %files mailbox
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/%{name}/etc/mailbox.conf
 %config(noreplace) %{_sysconfdir}/%{name}/etc/mailbox_query.conf
-%doc doc/Readme.mailbox
+%doc doc/Readme.mailbox.txt
 %dir %{_datadir}/%{name}/audio/mailbox
 %dir %{_libdir}/%{name}/ivr/imap_mailbox
 %{_datadir}/%{name}/audio/mailbox/and.wav
@@ -525,22 +597,22 @@ fi
 %files pin_collect
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/%{name}/etc/pin_collect.conf
-%doc doc/Readme.pin_collect
-%dir %{_datadir}/%{name}/audio/pincollect
-%{_datadir}/%{name}/audio/pincollect/enter_pin.wav
-%{_datadir}/%{name}/audio/pincollect/welcome.wav
+%doc doc/Readme.pin_collect.txt
+%dir %{_datadir}/%{name}/audio/pin_collect
+%{_datadir}/%{name}/audio/pin_collect/enter_pin.wav
+%{_datadir}/%{name}/audio/pin_collect/welcome.wav
 %{_libdir}/%{name}/ivr/pin_collect.py
 %{_libdir}/%{name}/ivr/pin_collect.pyc
 %{_libdir}/%{name}/ivr/pin_collect.pyo
 
-#%files python
-#%defattr(-,root,root)
-#%config(noreplace) %{_sysconfdir}/%{name}/etc/py_sems.conf
-#%doc doc/Readme.py_sems
-#%{_libdir}/%{name}/plug-in/py_sems.so
-#%{_libdir}/%{name}/plug-in/py_sems_log.py
-#%{_libdir}/%{name}/plug-in/py_sems_log.pyc
-#%{_libdir}/%{name}/plug-in/py_sems_log.pyo
+%files python
+%defattr(-,root,root)
+%config(noreplace) %{_sysconfdir}/%{name}/etc/py_sems.conf
+%doc doc/Readme.py_sems.txt
+%{_libdir}/%{name}/plug-in/py_sems.so
+%{_libdir}/%{name}/plug-in/py_sems_log.py
+%{_libdir}/%{name}/plug-in/py_sems_log.pyc
+%{_libdir}/%{name}/plug-in/py_sems_log.pyo
 
 %files speex
 %defattr(-,root,root)
@@ -549,10 +621,18 @@ fi
 %files xmlrpc2di
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/%{name}/etc/xmlrpc2di.conf
-%doc doc/Readme.xmlrpc2di
+%doc doc/Readme.xmlrpc2di.txt
 %{_libdir}/%{name}/plug-in/xmlrpc2di.so
 
 %changelog
+* 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)
+- All old patches were either applied upstream or dropped (no longer required)
+- Finally removed unixsockctrl interface
+- New sub-packages: conference, dsm, early_announce
+- Module py_sems was re-enabled
+
 * Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> 1.1.1-7
 - drop BR: sip-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Jul 2009 14:38:50 -0000	1.3
+++ sources	1 Apr 2010 13:44:39 -0000	1.4
@@ -1 +1 @@
-1faee6a6e7c85babd84288cd7e0ff7cc  sems-1.1.1.w_o_ilbc_sources.tar.gz
+56fae7b42d9f2ca2b111a4ee41b575fe  sems-1.2.0.w_o_ilbc_sources.tar.gz


--- sems--external_gsm_lib.diff DELETED ---


--- sems--flite-hardcoded-path-removal.diff DELETED ---


--- sems--gcc44.diff DELETED ---


--- sems--makefile_defs_removal.diff DELETED ---


--- sems--openssl10.diff DELETED ---


--- sems--py_sources_install.diff DELETED ---


--- sems--spandsp_0_0_6_fix.diff DELETED ---


--- sems--xmlrpc++-use_fedora_cxxflags.diff DELETED ---

