[sems] Enabled iLBC ( https://bugzilla.redhat.com/728302#c26 )
Peter Lemenkov
peter at fedoraproject.org
Thu Apr 19 11:33:48 UTC 2012
commit 8937bb210bf48ca08707f36819727958ef53e512
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu Apr 19 15:33:34 2012 +0400
Enabled iLBC ( https://bugzilla.redhat.com/728302#c26 )
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...001-Force-to-use-system-wide-GSM-includes.patch | 6 +-
...llow-rewrite-of-custom-makefiles-by-CMake.patch | 6 +-
...Set-CFG_PREFIX-to-empty-string-by-default.patch | 6 +-
...ql-in-conference-and-early_announce-modul.patch | 5 +-
...aid_sip-plugin-to-default-exclude-list-du.patch | 6 +-
sems-0006-Don-t-start-py_sems-by-default.patch | 6 +-
...ved-symbol-in-sbc-module-when-compiled-wi.patch | 6 +-
sems-0008-Change-default-msg_storage-path.patch | 6 +-
sems-0009-Drop-privileges-for-SEMS-process.patch | 6 +-
sems-0010-Missing-include-for-close-FILE.patch | 27 ++++++
sems-0011-Fix-c-p-typo-in-cmake-files.patch | 34 ++++++++
...-systemd-related-files-to-the-pkg-rpm-dir.patch | 40 +++++++++
sems.service | 11 ---
sems.spec | 85 ++++++++++++++------
sems.tmpfiles.conf | 1 -
sources | 2 +-
17 files changed, 190 insertions(+), 64 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3de9daf..1d33445 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ sems-1.2.1.w_o_ilbc_sources.tar.gz
/sems-1.3.0.w_o_ilbc_sources.tar.gz
/sems-1.3.1.w_o_ilbc_sources.tar.gz
/sems-1.4.2.w_o_ilbc_sources.tar.gz
+/sems-1.4.2.tar.gz
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 75b3106..7dbad33 100644
--- a/sems-0001-Force-to-use-system-wide-GSM-includes.patch
+++ b/sems-0001-Force-to-use-system-wide-GSM-includes.patch
@@ -1,12 +1,12 @@
From 6d521cb639807a7e93954d05c8440724a289a38f 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/12] 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(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/plug-in/gsm/gsm.c b/core/plug-in/gsm/gsm.c
index 286a989..3517e59 100644
@@ -22,5 +22,5 @@ index 286a989..3517e59 100644
#include <stdlib.h>
--
-1.7.7.3
+1.7.10
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 b6ee9b2..c460bd8 100644
--- a/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch
+++ b/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch
@@ -1,12 +1,12 @@
From 456f9912196a27bed7418b43ecaf1ac69768dbd5 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/12] 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(-)
+ 1 file changed, 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7998e33..f143af5 100644
@@ -29,5 +29,5 @@ index 7998e33..f143af5 100644
OPTION(SEMS_USE_LIBSAMPLERATE "Build with libsamplerate" OFF)
OPTION(SEMS_USE_ZRTP "Build with ZRTP" OFF)
--
-1.7.7.3
+1.7.10
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 d5c8ab3..a4fc473 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,12 +1,12 @@
From fb8a5f575cceba39e3a73561b50d565797fb5d37 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/12] 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(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f143af5..d1a0fca 100644
@@ -22,5 +22,5 @@ index f143af5..d1a0fca 100644
MESSAGE(STATUS "SEMS cfg prefix was set to: ${SEMS_CFG_PREFIX}")
--
-1.7.7.3
+1.7.10
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 f41831e..06f278c 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,8 @@
From 29cc8539cfa4030f40b0e92527893e34acbee009 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/12] 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.
@@ -59,5 +60,5 @@ index 43c374e..03a1532 100644
SET(sems_module_name early_announce)
INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
--
-1.7.7.3
+1.7.10
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 3355d5a..acef2f3 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,13 +1,13 @@
From 6f4fa250de15cf99e6dc21b308f9ee24c0a79086 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
+Subject: [PATCH 05/12] Add sw_prepaid_sip plugin to default exclude list (due
to missing cc_acc)
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
core/etc/sems.conf.cmake | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/etc/sems.conf.cmake b/core/etc/sems.conf.cmake
index c4f900f..d29c1a5 100644
@@ -23,5 +23,5 @@ index c4f900f..d29c1a5 100644
# optional parameter: application
#
--
-1.7.7.3
+1.7.10
diff --git a/sems-0006-Don-t-start-py_sems-by-default.patch b/sems-0006-Don-t-start-py_sems-by-default.patch
index dd1d290..759d62c 100644
--- a/sems-0006-Don-t-start-py_sems-by-default.patch
+++ b/sems-0006-Don-t-start-py_sems-by-default.patch
@@ -1,12 +1,12 @@
From c1e9a77bfbafbdabd3afc0fcf64e635a0a83d030 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 6/9] Don't start py_sems by default
+Subject: [PATCH 06/12] Don't start py_sems by default
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
core/etc/sems.conf.cmake | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/etc/sems.conf.cmake b/core/etc/sems.conf.cmake
index d29c1a5..d4da40e 100644
@@ -22,5 +22,5 @@ index d29c1a5..d4da40e 100644
# optional parameter: application
#
--
-1.7.7.3
+1.7.10
diff --git a/sems-0007-Fix-unresolved-symbol-in-sbc-module-when-compiled-wi.patch b/sems-0007-Fix-unresolved-symbol-in-sbc-module-when-compiled-wi.patch
index b166d8d..9ce3b5d 100644
--- a/sems-0007-Fix-unresolved-symbol-in-sbc-module-when-compiled-wi.patch
+++ b/sems-0007-Fix-unresolved-symbol-in-sbc-module-when-compiled-wi.patch
@@ -1,13 +1,13 @@
From 92da5b357c2245615e918938e69fad8bb7cad48c Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 24 Nov 2011 00:11:14 +0400
-Subject: [PATCH 7/9] Fix unresolved symbol in sbc module when compiled with
+Subject: [PATCH 07/12] Fix unresolved symbol in sbc module when compiled with
cmake
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
apps/sbc/CMakeLists.txt | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
diff --git a/apps/sbc/CMakeLists.txt b/apps/sbc/CMakeLists.txt
index f9083b8..7201894 100644
@@ -22,5 +22,5 @@ index f9083b8..7201894 100644
SBC.cpp
SBCCallProfile.cpp
--
-1.7.7.3
+1.7.10
diff --git a/sems-0008-Change-default-msg_storage-path.patch b/sems-0008-Change-default-msg_storage-path.patch
index 5161367..9331c59 100644
--- a/sems-0008-Change-default-msg_storage-path.patch
+++ b/sems-0008-Change-default-msg_storage-path.patch
@@ -1,12 +1,12 @@
From 94f6eefb1406c69943d18616a9933ae8685056d4 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 24 Nov 2011 19:57:05 +0400
-Subject: [PATCH 8/9] Change default msg_storage path
+Subject: [PATCH 08/12] Change default msg_storage path
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
apps/msg_storage/etc/msg_storage.conf.cmake | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/msg_storage/etc/msg_storage.conf.cmake b/apps/msg_storage/etc/msg_storage.conf.cmake
index efab27f..dadf5d8 100644
@@ -19,5 +19,5 @@ index efab27f..dadf5d8 100644
-#storage_dir=/var/spool/voicebox/
+storage_dir=/var/spool/sems/voicebox/
--
-1.7.7.3
+1.7.10
diff --git a/sems-0009-Drop-privileges-for-SEMS-process.patch b/sems-0009-Drop-privileges-for-SEMS-process.patch
index 7105bc3..f0a65d7 100644
--- a/sems-0009-Drop-privileges-for-SEMS-process.patch
+++ b/sems-0009-Drop-privileges-for-SEMS-process.patch
@@ -1,12 +1,12 @@
From a5c352a314db3ccd9d93e5e84d331a180e90d7a7 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 24 Nov 2011 23:51:59 +0400
-Subject: [PATCH 9/9] Drop privileges for SEMS process
+Subject: [PATCH 09/12] Drop privileges for SEMS process
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
pkg/rpm/sems.init | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg/rpm/sems.init b/pkg/rpm/sems.init
index 9e6080f..15e9847 100755
@@ -22,5 +22,5 @@ index 9e6080f..15e9847 100755
echo
[ $RETVAL = 0 ] && touch $lockfile
--
-1.7.7.3
+1.7.10
diff --git a/sems-0010-Missing-include-for-close-FILE.patch b/sems-0010-Missing-include-for-close-FILE.patch
new file mode 100644
index 0000000..43c666e
--- /dev/null
+++ b/sems-0010-Missing-include-for-close-FILE.patch
@@ -0,0 +1,27 @@
+From 219a33b20daf2d3a76264be17551475f25e46509 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Thu, 5 Apr 2012 15:11:18 +0400
+Subject: [PATCH 10/12] Missing include for close(FILE *)
+
+This will affects only gcc 4.7.0+ users. Others won't see any difference.
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ core/plug-in/stats/query_stats.cxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/core/plug-in/stats/query_stats.cxx b/core/plug-in/stats/query_stats.cxx
+index 674f16c..10c498a 100644
+--- a/core/plug-in/stats/query_stats.cxx
++++ b/core/plug-in/stats/query_stats.cxx
+@@ -7,6 +7,7 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <stdlib.h>
++#include <unistd.h>
+
+ #include <map>
+ #include <string>
+--
+1.7.10
+
diff --git a/sems-0011-Fix-c-p-typo-in-cmake-files.patch b/sems-0011-Fix-c-p-typo-in-cmake-files.patch
new file mode 100644
index 0000000..8b600cf
--- /dev/null
+++ b/sems-0011-Fix-c-p-typo-in-cmake-files.patch
@@ -0,0 +1,34 @@
+From ea2971ca52ab14fe6c6564c7c342728a64b592ed Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Thu, 5 Apr 2012 16:58:28 +0400
+Subject: [PATCH 11/12] Fix c/p typo in cmake-files
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ cmake/FindLibev.cmake | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/FindLibev.cmake b/cmake/FindLibev.cmake
+index fd90af6..5bf3504 100644
+--- a/cmake/FindLibev.cmake
++++ b/cmake/FindLibev.cmake
+@@ -6,12 +6,12 @@ IF(LIBEV_INCLUDE_DIR AND LIBEV_LIBRARIES)
+ ENDIF(LIBEV_INCLUDE_DIR AND LIBEV_LIBRARIES)
+
+ IF(LIBEV_FOUND)
+- IF (NOT Speex_FIND_QUIETLY)
++ IF (NOT Libev_FIND_QUIETLY)
+ MESSAGE(STATUS "Found libev includes: ${LIBEV_INCLUDE_DIR}/libev/ev.h")
+ MESSAGE(STATUS "Found libev library: ${LIBEV_LIBRARIES}")
+- ENDIF (NOT Speex_FIND_QUIETLY)
++ ENDIF (NOT Libev_FIND_QUIETLY)
+ ELSE(LIBEV_FOUND)
+- IF (Speex_FIND_REQUIRED)
++ IF (Libev_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could NOT find libev development files")
+- ENDIF (Speex_FIND_REQUIRED)
++ ENDIF (Libev_FIND_REQUIRED)
+ ENDIF(LIBEV_FOUND)
+--
+1.7.10
+
diff --git a/sems-0012-Add-systemd-related-files-to-the-pkg-rpm-dir.patch b/sems-0012-Add-systemd-related-files-to-the-pkg-rpm-dir.patch
new file mode 100644
index 0000000..46b19b5
--- /dev/null
+++ b/sems-0012-Add-systemd-related-files-to-the-pkg-rpm-dir.patch
@@ -0,0 +1,40 @@
+From 17daf3faecfcd9961311b6c5a79a4750a71ca090 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Wed, 18 Apr 2012 21:51:48 +0400
+Subject: [PATCH 12/12] Add systemd-related files to the pkg/rpm dir
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ pkg/rpm/sems.systemd.service | 11 +++++++++++
+ pkg/rpm/sems.systemd.tmpfiles.d.conf | 1 +
+ 2 files changed, 12 insertions(+)
+ create mode 100644 pkg/rpm/sems.systemd.service
+ create mode 100644 pkg/rpm/sems.systemd.tmpfiles.d.conf
+
+diff --git a/pkg/rpm/sems.systemd.service b/pkg/rpm/sems.systemd.service
+new file mode 100644
+index 0000000..ffe2a60
+--- /dev/null
++++ b/pkg/rpm/sems.systemd.service
+@@ -0,0 +1,11 @@
++[Unit]
++Description=SIP Media Server
++After=network.target
++
++[Service]
++Type=simple
++User=sems
++Group=sems
++EnvironmentFile=-/etc/sysconfig/sems
++PIDFile=/var/run/sems/sems.pid
++ExecStart=/usr/sbin/sems -E -u sems -g sems -P /var/run/sems/sems.pid $OPTIONS
+diff --git a/pkg/rpm/sems.systemd.tmpfiles.d.conf b/pkg/rpm/sems.systemd.tmpfiles.d.conf
+new file mode 100644
+index 0000000..d1428ea
+--- /dev/null
++++ b/pkg/rpm/sems.systemd.tmpfiles.d.conf
+@@ -0,0 +1 @@
++d /var/run/sems 0755 sems sems
+--
+1.7.10
+
diff --git a/sems.spec b/sems.spec
index 15ab92b..e47ae98 100644
--- a/sems.spec
+++ b/sems.spec
@@ -1,17 +1,11 @@
Summary: SIP Express Media Server, an extensible SIP media server
Name: sems
Version: 1.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
URL: http://www.iptel.org/sems
-## wget http://ftp.iptel.org/pub/sems/sems-1.4.2.tar.gz
-## tar zx --exclude iLBC_rfc3951 -f sems-1.4.2.tar.gz
-## tar czf sems-1.4.2.w_o_ilbc_sources.tar.gz sems-1.4.2
-Source0: %{name}-%{version}.w_o_ilbc_sources.tar.gz
+Source0: http://ftp.iptel.org/pub/%{name}/%{name}-%{version}.tar.gz
Source1: %{name}.sysconfig
-%if 0%{?fc15}%{?fc16}%{?fc17}
-# systemd stuff
-Source2: %{name}.service
-Source3: %{name}.tmpfiles.conf
+%if 0%{?fc15}%{?fc16}%{?fc17}%{?fc18}
BuildRequires: systemd-units
%endif
License: GPLv2+
@@ -29,12 +23,18 @@ Patch4: sems-0004-Disable-mysql-in-conference-and-early_announce-modul.patch
Patch5: sems-0005-Add-sw_prepaid_sip-plugin-to-default-exclude-list-du.patch
# Fedora-specific
Patch6: sems-0006-Don-t-start-py_sems-by-default.patch
-# Will be proposed for inclusion in upstream
+# Applied upstream
Patch7: sems-0007-Fix-unresolved-symbol-in-sbc-module-when-compiled-wi.patch
# Will be proposed for inclusion in upstream
Patch8: sems-0008-Change-default-msg_storage-path.patch
-# Will be proposed for inclusion in upstream
+# Applied upstream
Patch9: sems-0009-Drop-privileges-for-SEMS-process.patch
+# Applied upstream
+Patch10: sems-0010-Missing-include-for-close-FILE.patch
+# Applied upstream
+Patch11: sems-0011-Fix-c-p-typo-in-cmake-files.patch
+# Applied upstream
+Patch12: sems-0012-Add-systemd-related-files-to-the-pkg-rpm-dir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python >= 2.3
@@ -50,9 +50,16 @@ BuildRequires: openssl-devel
BuildRequires: mysql++-devel
BuildRequires: cmake >= 2.4
Requires(pre): /usr/sbin/useradd
-Requires(post): /sbin/chkconfig
-Requires(preun):/sbin/chkconfig
-Requires(preun):/sbin/service
+#Initscripts
+%if 0%{?fc15}%{?fc16}%{?fc17}%{?fc18}
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+%else
+Requires(post): chkconfig
+Requires(preun):chkconfig
+Requires(preun):initscripts
+%endif
# Disable gateway module
Obsoletes: sems-gateway =< 1.3.1
Provides: sems-gateway = %{version}-%{release}
@@ -142,6 +149,14 @@ Requires: %{name} = %{version}-%{release}
%description gsm
GSM support for SEMS.
+%package ilbc
+Summary: iLBC support for SEMS
+Group: Applications/Communications
+Requires: %{name} = %{version}-%{release}
+
+%description ilbc
+iLBC support for SEMS.
+
%package ivr
Summary: IVR functionality for SEMS
Group: Applications/Communications
@@ -213,6 +228,9 @@ rm -rf core/plug-in/gsm/gsm-1.0-pl10/
%patch7 -p1 -b .add_missing_symbol
%patch8 -p1 -b .fix_defauls_msg_storage_path
%patch9 -p1 -b .drop_privileges
+%patch10 -p1 -b .missing_include
+%patch11 -p1 -b .typo
+%patch12 -p1 -b .systemd_files
iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client.txt > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client.{utf8,txt}
@@ -225,7 +243,7 @@ mv ./apps/dsm/fsmc/readme.txt ./apps/dsm/fsmc/Readme.fsmc.txt
-DSEMS_USE_LIBSAMPLERATE=yes \
-DSEMS_USE_ZRTP=NO \
-DSEMS_USE_MP3=NO \
- -DSEMS_USE_ILBC=NO \
+ -DSEMS_USE_ILBC=yes \
-DSEMS_USE_TTS=yes \
-DSEMS_USE_OPENSSL=yes \
-DSEMS_USE_MONITORING=yes \
@@ -244,10 +262,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
install -D -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-%if 0%{?fc15}%{?fc16}%{?fc17}
+%if 0%{?fc15}%{?fc16}%{?fc17}%{?fc18}
# install systemd files
-install -D -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
-install -D -m 0644 -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
+install -D -m 0644 -p pkg/rpm/sems.systemd.service $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
+install -D -m 0644 -p pkg/rpm/sems.systemd.tmpfiles.d.conf $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}
%else
# install init-script
@@ -278,16 +296,31 @@ getent passwd %{name} >/dev/null || \
%post
+%if 0%{?fc15}%{?fc16}%{?fc17}%{?fc18}
+if [ $1 -eq 1 ] ; then
+ # Initial installation
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+%else
if [ $1 -eq 1 ]; then
/sbin/chkconfig --add sems || :
fi
+%endif
%preun
+%if 0%{?fc15}%{?fc16}%{?fc17}%{?fc18}
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable sems.service > /dev/null 2>&1 || :
+ /bin/systemctl stop sems.service > /dev/null 2>&1 || :
+fi
+%else
if [ $1 -eq 0 ]; then
/sbin/service sems stop >/dev/null 2>&1 || :
/sbin/chkconfig --del sems || :
fi
+%endif
%files
@@ -312,7 +345,7 @@ fi
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%if 0%{?fc15}%{?fc16}%{?fc17}
+%if 0%{?fc15}%{?fc16}%{?fc17}%{?fc18}
%{_unitdir}/%{name}.service
%{_sysconfdir}/tmpfiles.d/%{name}.conf
%dir %attr(0755, %{name}, %{name}) %{_localstatedir}/run/%{name}
@@ -370,9 +403,6 @@ fi
%doc doc/Readme.click2dial.txt
%doc doc/Readme.conf_auth.txt
%doc doc/Readme.echo.txt
-%if 0%{?with_ilbc}
-%doc doc/Readme.iLBC.txt
-%endif
%doc doc/Readme.monitoring.txt
%if 0%{?with_mp3}
%doc doc/Readme.mp3plugin.txt
@@ -495,9 +525,6 @@ fi
%{_libdir}/%{name}/plug-in/callback.so
%{_libdir}/%{name}/plug-in/click2dial.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
@@ -576,6 +603,11 @@ fi
%defattr(-,root,root)
%{_libdir}/%{name}/plug-in/gsm.so
+%files ilbc
+%defattr(-,root,root)
+%doc doc/Readme.iLBC.txt
+%{_libdir}/%{name}/plug-in/ilbc.so
+
%files ivr
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/ivr.conf
@@ -653,6 +685,9 @@ fi
%{_libdir}/%{name}/plug-in/xmlrpc2di.so
%changelog
+* Thu Apr 19 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.4.2-5
+- Enabled iLBC ( https://bugzilla.redhat.com/728302#c26 )
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.2-4
- Rebuilt for c++ ABI breakage
diff --git a/sources b/sources
index 2832e69..2b52531 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e2b6abed664971d123d7ee52eaefe7b sems-1.4.2.w_o_ilbc_sources.tar.gz
+6c3fb1330df6690404565220f5115d61 sems-1.4.2.tar.gz
More information about the scm-commits
mailing list