[sems] Fixed linking issues
Peter Lemenkov
peter at fedoraproject.org
Mon Jan 3 20:28:27 UTC 2011
commit a33d0817176048a5f2ffb12eb943cc9ddfbe6992
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon Jan 3 23:27:56 2011 +0300
Fixed linking issues
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
...001-Force-to-use-system-wide-GSM-includes.patch | 2 +-
...llow-rewrite-of-custom-makefiles-by-CMake.patch | 2 +-
...Set-CFG_PREFIX-to-empty-string-by-default.patch | 2 +-
...ql-in-conference-and-early_announce-modul.patch | 2 +-
...aid_sip-plugin-to-default-exclude-list-du.patch | 2 +-
sems-0006-last-minute-fix-proper-version.patch | 2 +-
...gateway-module-s-version-passing-in-CMake.patch | 2 +-
sems-0008-Install-email-template.patch | 2 +-
sems-0009-Don-t-start-py_sems-by-default.patch | 2 +-
sems-0010-Move-CMake-defines.patch | 66 ++++++++++++++++++++
sems.spec | 8 ++-
11 files changed, 82 insertions(+), 10 deletions(-)
---
diff --git a/sems-0001-Force-to-use-system-wide-GSM-includes.patch b/sems-0001-Force-to-use-system-wide-GSM-includes.patch
index f6a8162..280d7bd 100644
--- a/sems-0001-Force-to-use-system-wide-GSM-includes.patch
+++ b/sems-0001-Force-to-use-system-wide-GSM-includes.patch
@@ -1,7 +1,7 @@
From de3c54f85f893e4ee985b1da93cc014b00456fa8 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/9] Force to use system-wide GSM includes
+Subject: [PATCH 01/10] Force to use system-wide GSM includes
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
diff --git a/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch b/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch
index f372092..ae99289 100644
--- a/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch
+++ b/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch
@@ -1,7 +1,7 @@
From 26929b6a7a62299b71bf7c99f17f75670a2040e2 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/9] Allow rewrite of custom makefiles by CMake
+Subject: [PATCH 02/10] Allow rewrite of custom makefiles by CMake
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
diff --git a/sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch b/sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch
index 9ec0ebd..9809b67 100644
--- a/sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch
+++ b/sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch
@@ -1,7 +1,7 @@
From e322f2e00e48b639b5d87ed06738aa24d99396bf 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/9] Set CFG_PREFIX to empty string by default
+Subject: [PATCH 03/10] Set CFG_PREFIX to empty string by default
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
diff --git a/sems-0004-Disable-mysql-in-conference-and-early_announce-modul.patch b/sems-0004-Disable-mysql-in-conference-and-early_announce-modul.patch
index e6bd449..71dfa53 100644
--- a/sems-0004-Disable-mysql-in-conference-and-early_announce-modul.patch
+++ b/sems-0004-Disable-mysql-in-conference-and-early_announce-modul.patch
@@ -1,7 +1,7 @@
From 4a2b5ca2644db000dbace63c8bdd278109f6d356 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 25 Jun 2010 12:16:45 +0400
-Subject: [PATCH 4/9] Disable mysql++ in conference and early_announce modules
+Subject: [PATCH 04/10] Disable mysql++ in conference and early_announce modules
Unfortunately, this breaks existing configurations, which is a
no-go situation for EPEL repository. We'll enable it later.
diff --git a/sems-0005-Add-sw_prepaid_sip-plugin-to-default-exclude-list-du.patch b/sems-0005-Add-sw_prepaid_sip-plugin-to-default-exclude-list-du.patch
index d1a9719..177b81c 100644
--- a/sems-0005-Add-sw_prepaid_sip-plugin-to-default-exclude-list-du.patch
+++ b/sems-0005-Add-sw_prepaid_sip-plugin-to-default-exclude-list-du.patch
@@ -1,7 +1,7 @@
From 2f0556c126f2cae0edec32b0fd269d496dd068f6 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon, 27 Sep 2010 14:13:00 +0400
-Subject: [PATCH 5/9] Add sw_prepaid_sip plugin to default exclude list (due to missing cc_acc)
+Subject: [PATCH 05/10] Add sw_prepaid_sip plugin to default exclude list (due to missing cc_acc)
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
diff --git a/sems-0006-last-minute-fix-proper-version.patch b/sems-0006-last-minute-fix-proper-version.patch
index 12bdd34..e4a508b 100644
--- a/sems-0006-last-minute-fix-proper-version.patch
+++ b/sems-0006-last-minute-fix-proper-version.patch
@@ -1,7 +1,7 @@
From 708b02d96f4a4acb7c4ede0387a84d2f5948e0db Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon, 27 Dec 2010 17:18:46 +0300
-Subject: [PATCH 6/9] last-minute fix - proper version
+Subject: [PATCH 06/10] last-minute fix - proper version
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
diff --git a/sems-0007-Fix-gateway-module-s-version-passing-in-CMake.patch b/sems-0007-Fix-gateway-module-s-version-passing-in-CMake.patch
index 2e9dee5..114e13d 100644
--- a/sems-0007-Fix-gateway-module-s-version-passing-in-CMake.patch
+++ b/sems-0007-Fix-gateway-module-s-version-passing-in-CMake.patch
@@ -1,7 +1,7 @@
From 7f2c45fc1e9c2c1900244709abfa125c9b7e5755 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 29 Dec 2010 16:02:44 +0300
-Subject: [PATCH 7/9] Fix gateway module's version passing in CMake
+Subject: [PATCH 07/10] Fix gateway module's version passing in CMake
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
diff --git a/sems-0008-Install-email-template.patch b/sems-0008-Install-email-template.patch
index a5570a5..fb3a6ea 100644
--- a/sems-0008-Install-email-template.patch
+++ b/sems-0008-Install-email-template.patch
@@ -1,7 +1,7 @@
From 57e8f6ccdf5335207f7017414487db6bf81a64f3 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 29 Dec 2010 16:55:50 +0300
-Subject: [PATCH 8/9] Install email template
+Subject: [PATCH 08/10] Install email template
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
diff --git a/sems-0009-Don-t-start-py_sems-by-default.patch b/sems-0009-Don-t-start-py_sems-by-default.patch
index 5a8cd15..d69fe6c 100644
--- a/sems-0009-Don-t-start-py_sems-by-default.patch
+++ b/sems-0009-Don-t-start-py_sems-by-default.patch
@@ -1,7 +1,7 @@
From 8712daf57f4ec10caadd215dc969b1f261a949b5 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 29 Dec 2010 17:02:49 +0300
-Subject: [PATCH 9/9] Don't start py_sems by default
+Subject: [PATCH 09/10] Don't start py_sems by default
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
diff --git a/sems-0010-Move-CMake-defines.patch b/sems-0010-Move-CMake-defines.patch
new file mode 100644
index 0000000..3fc8636
--- /dev/null
+++ b/sems-0010-Move-CMake-defines.patch
@@ -0,0 +1,66 @@
+From c6fe28de4a05e33c317019261711f2babe98b95d Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Mon, 3 Jan 2011 22:16:24 +0300
+Subject: [PATCH 10/10] Move CMake defines
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ CMakeLists.txt | 3 +++
+ core/CMakeLists.txt | 6 ------
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 78a6dfb..fdc88f4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -80,6 +80,7 @@ SET(CMAKE_VERBOSE_MAKEFILE ON)
+ # (which means that current debian and gentoo packages don't work)
+ IF(SEMS_USE_SPANDSP)
+ FIND_PACKAGE(Spandsp REQUIRED)
++ ADD_DEFINITIONS(-DUSE_SPANDSP -D__STDC_LIMIT_MACROS)
+ MESSAGE(STATUS "Using spandsp: YES")
+ ELSE(SEMS_USE_SPANDSP)
+ MESSAGE(STATUS "Using spandsp: NO (default)")
+@@ -89,6 +90,7 @@ ENDIF(SEMS_USE_SPANDSP)
+ # (see http://www.mega-nerd.com/SRC/)
+ IF(SEMS_USE_LIBSAMPLERATE)
+ FIND_PACKAGE(Libsamplerate REQUIRED)
++ ADD_DEFINITIONS(-DUSE_LIBSAMPLERATE)
+ MESSAGE(STATUS "Using libsamplerate: YES")
+ ELSE(SEMS_USE_LIBSAMPLERATE)
+ MESSAGE(STATUS "Using libsamplerate: NO (default)")
+@@ -128,6 +130,7 @@ ELSE(SEMS_USE_MONITORING)
+ ENDIF(SEMS_USE_MONITORING)
+
+ IF(SEMS_USE_IPV6)
++ ADD_DEFINITIONS(-DSUPPORT_IPV6)
+ MESSAGE(STATUS "Enable IPv6 support: YES")
+ ELSE(SEMS_USE_IPV6)
+ MESSAGE(STATUS "Enable IPv6 support: NO (default)")
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 7bd1341..5f0fb3f 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -18,19 +18,13 @@ ENDIF(NOT MAX_RTP_SESSIONS)
+ ADD_DEFINITIONS(-DMAX_RTP_SESSIONS=${MAX_RTP_SESSIONS})
+
+ IF(SPANDSP_FOUND)
+- ADD_DEFINITIONS(-DUSE_SPANDSP -D__STDC_LIMIT_MACROS)
+ TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} spandsp)
+ ENDIF(SPANDSP_FOUND)
+
+ IF(LIBSAMPLERATE_FOUND)
+- ADD_DEFINITIONS(-DUSE_LIBSAMPLERATE)
+ TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} samplerate)
+ ENDIF(LIBSAMPLERATE_FOUND)
+
+-IF(SEMS_USE_IPV6)
+- ADD_DEFINITIONS(-DSUPPORT_IPV6)
+-ENDIF(SEMS_USE_IPV6)
+-
+ ADD_SUBDIRECTORY(plug-in)
+
+ # Create config-file from template
+--
+1.7.3.4
+
diff --git a/sems.spec b/sems.spec
index 07aa8f3..275924f 100644
--- a/sems.spec
+++ b/sems.spec
@@ -1,7 +1,7 @@
Summary: SIP Express Media Server, an extensible SIP media server
Name: sems
Version: 1.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://www.iptel.org/sems
## wget http://ftp.iptel.org/pub/sems/sems-1.3.1.tar.gz
## tar zx --exclude iLBC_rfc3951 -f sems-1.3.1.tar.gz
@@ -28,6 +28,8 @@ Patch7: sems-0007-Fix-gateway-module-s-version-passing-in-CMake.patch
Patch8: sems-0008-Install-email-template.patch
# Fedora-specific
Patch9: sems-0009-Don-t-start-py_sems-by-default.patch
+# Backported
+Patch10: sems-0010-Move-CMake-defines.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python >= 2.3
@@ -202,6 +204,7 @@ rm -rf core/plug-in/gsm/gsm-1.0-pl10/
%patch7 -p1 -b .gw_ver
%patch8 -p1 -b .install_email_template
%patch9 -p1 -b .dont_start_py_sems
+%patch10 -p1 -b .correct_defines
iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client.txt > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client.{utf8,txt}
@@ -601,6 +604,9 @@ fi
%{_libdir}/%{name}/plug-in/xmlrpc2di.so
%changelog
+* Mon Jan 3 2011 Peter Lemenkov <lemenkov at gmail.com> 1.3.1-3
+- Fixed linking issues
+
* Wed Dec 29 2010 Peter Lemenkov <lemenkov at gmail.com> 1.3.1-2
- Fixed segfault in gateway module
- Properly install email template for voicemail module
More information about the scm-commits
mailing list