<h1>Project "FreeSWITCH Source" received a push.</h1>
<h2>branch: master updated</h2>
<pre>
via: 3ce98c4ebddec0e459c564942f6beb583350188a (commit)
from: e8335f588002217240ab49bc12504b42e89114d4 (commit)
</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Michal Bielicki - cypromis
comments:
major cleanups, mod_skinny and skypopen and sangoma ftdm modules added to rpm spec file
<span style="color: #000080; font-weight: bold">diff --git a/freeswitch.spec b/freeswitch.spec</span>
<span style="color: #000080; font-weight: bold">index 7fb9f80..9b6e60f 100644</span>
<span style="color: #A00000">--- a/freeswitch.spec</span>
<span style="color: #00A000">+++ b/freeswitch.spec</span>
<span style="color: #800080; font-weight: bold">@@ -27,6 +27,14 @@</span>
# Maintainer(s): Michal Bielicki <michal.bielicki (at) ++nospam_please++ seventhsignal.de
#
######################################################################################################################
<span style="color: #00A000">+# Module build settings</span>
<span style="color: #00A000">+%define build_sng_isdn 0</span>
<span style="color: #00A000">+%define build_sng_ss7 0</span>
<span style="color: #00A000">+%define build_sng_tc 0</span>
<span style="color: #00A000">+%{?with_sang_tc:%define build_sng_tc 1 }</span>
<span style="color: #00A000">+%{?with_sang_isdn:%define build_sng_isdn 1 }</span>
<span style="color: #00A000">+%{?with_sang_ss7:%define build_sng_ss7 1 }</span>
<span style="color: #00A000">+</span>
######################################################################################################################
#
# disable rpath checking
<span style="color: #800080; font-weight: bold">@@ -54,7 +62,7 @@ Vendor: http://www.freeswitch.org/</span>
#
######################################################################################################################
Source0: http://files.freeswitch.org/%{name}-%{version}.tar.bz2
<span style="color: #A00000">-Source1: http://files.freeswitch.org/downloads/libs/celt-0.7.1.tar.gz</span>
<span style="color: #00A000">+Source1: http://files.freeswitch.org/downloads/libs/celt-0.10.0.tar.gz</span>
Source2: http://files.freeswitch.org/downloads/libs/flite-1.3.99-latest.tar.gz
Source3: http://files.freeswitch.org/downloads/libs/lame-3.97.tar.gz
Source4: http://files.freeswitch.org/downloads/libs/libshout-2.2.2.tar.gz
<span style="color: #800080; font-weight: bold">@@ -65,6 +73,8 @@ Source8: http://files.freeswitch.org/downloads/libs/soundtouch-1.3.1.tar.gz</span>
Source9: http://files.freeswitch.org/downloads/libs/sphinxbase-0.4.99-20091212.tar.gz
Source10: http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz
Source11: http://files.freeswitch.org/downloads/libs/libmemcached-0.32.tar.gz
<span style="color: #00A000">+Source12: http://files.freeswitch.org/downloads/libs/json-c-0.9.tar.gz</span>
<span style="color: #00A000">+Source13: http://files.freeswitch.org/downloads/libs/opus-0.9.0.tar.gz</span>
Prefix: %{prefix}
<span style="color: #800080; font-weight: bold">@@ -109,6 +119,8 @@ BuildRequires: which</span>
BuildRequires: zlib-devel
BuildRequires: e2fsprogs-devel
BuildRequires: libtheora-devel
<span style="color: #00A000">+BuildRequires: libxml2-devel</span>
<span style="color: #00A000">+BuildRequires: bison</span>
Requires: alsa-lib
Requires: libogg
Requires: libvorbis
<span style="color: #800080; font-weight: bold">@@ -124,6 +136,7 @@ Requires: zlib</span>
Requires: libtiff
Requires: python
Requires: libtheora
<span style="color: #00A000">+Requires: libxml2</span>
%if %{?suse_version:1}0
%if 0%{?suse_version} > 910
<span style="color: #800080; font-weight: bold">@@ -282,14 +295,72 @@ German language phrases module and directory structure for say module and voicem</span>
Summary: Provides a unified interface to hardware TDM cards and ss7 stacks for FreeSWITCH
Group: System/Libraries
Requires: %{name} = %{version}-%{release}
<span style="color: #A00000">-%{?with_sang_isdn: Requires: wanpipe }</span>
<span style="color: #A00000">-%{?with_sang_isdn: Requires: libsng_isdn }</span>
<span style="color: #A00000">-%{?with_sang_isdn: BuildRequires: wanpipe }</span>
<span style="color: #A00000">-%{?with_sang_isdn: BuildRequires: libang_isdn }</span>
%description freetdm
FreeTDM
<span style="color: #00A000">+%if %{build_sng_isdn}</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+%package freetdm-sng-isdn</span>
<span style="color: #00A000">+Summary: Sangoma ISDN Module for FreeTDM</span>
<span style="color: #00A000">+Group: System/Libraries</span>
<span style="color: #00A000">+Requires: %{name} = %{version}-%{release}</span>
<span style="color: #00A000">+Requires: %{name}-freetdm = %{version}-%{release}</span>
<span style="color: #00A000">+Requires: wanpipe </span>
<span style="color: #00A000">+Requires: libsng_isdn </span>
<span style="color: #00A000">+BuildRequires: wanpipe </span>
<span style="color: #00A000">+BuildRequires: libsng_isdn </span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+%description freetdm-sng-isdn</span>
<span style="color: #00A000">+Sangoma ISDN Module for freetdm</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+%endif</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+%if %{build_sng_ss7}</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+%package freetdm-sng-ss7</span>
<span style="color: #00A000">+Summary: Provides a unified interface to hardware TDM cards and ss7 stacks for FreeSWITCH, Sangoma SS7 Module</span>
<span style="color: #00A000">+Group: System/Libraries</span>
<span style="color: #00A000">+Requires: %{name} = %{version}-%{release}</span>
<span style="color: #00A000">+Requires: %{name}-freetdm = %{version}-%{release}</span>
<span style="color: #00A000">+Requires: wanpipe </span>
<span style="color: #00A000">+Requires: libsng_ss7 </span>
<span style="color: #00A000">+BuildRequires: wanpipe </span>
<span style="color: #00A000">+BuildRequires: libsng_ss7 </span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+%description freetdm-sng-ss7</span>
<span style="color: #00A000">+Sangoma SMG-SS7 drivers for FreeTDM</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+%endif</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+%if %{build_sng_tc}</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+%package sangoma-codec</span>
<span style="color: #00A000">+Summary: Sangoma D100 and D500 Codec Card Support</span>
<span style="color: #00A000">+Group: System/Libraries</span>
<span style="color: #00A000">+Requires: %{name} = %{version}-%{release}</span>
<span style="color: #00A000">+Requires: sng-tc-linux</span>
<span style="color: #00A000">+BuildRequires: sng-tc-linux</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+%description sangoma-codec</span>
<span style="color: #00A000">+Sangoma D100 and D500 Codec Card Support</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+%endif</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+%package skypopen</span>
<span style="color: #00A000">+Summary: Skype Endpoint</span>
<span style="color: #00A000">+Group: System/Libraries</span>
<span style="color: #00A000">+Requires: %{name} = %{version}-%{release}</span>
<span style="color: #00A000">+Requires: libX11</span>
<span style="color: #00A000">+BuildRequires: libX11-devel</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+%description skypopen</span>
<span style="color: #00A000">+This software (Skypopen) uses the Skype API but is not endorsed, certified or otherwise approved in any way by Skype.</span>
<span style="color: #00A000">+Skypopen is an endpoint (channel driver) that uses the Skype client as an interface to the Skype network, and allows </span>
<span style="color: #00A000">+incoming and outgoing Skype calls to/from FreeSWITCH (that can be bridged, originated, answered, etc. as in all other </span>
<span style="color: #00A000">+endpoints, e.g. Sofia-SIP).</span>
<span style="color: #00A000">+</span>
######################################################################################################################
#
# Unpack and prepare Source archives, copy stuff around etc ..
<span style="color: #800080; font-weight: bold">@@ -309,6 +380,8 @@ cp %{SOURCE8} libs/</span>
cp %{SOURCE9} libs/
cp %{SOURCE10} libs/
cp %{SOURCE11} libs/
<span style="color: #00A000">+cp %{SOURCE12} libs/</span>
<span style="color: #00A000">+cp %{SOURCE13} libs/</span>
######################################################################################################################
#
<span style="color: #800080; font-weight: bold">@@ -358,7 +431,11 @@ ASR_TTS_MODULES="asr_tts/mod_pocketsphinx asr_tts/mod_flite asr_tts/mod_unimrcp"</span>
#
######################################################################################################################
CODECS_MODULES="codecs/mod_bv codecs/mod_h26x codecs/mod_speex codecs/mod_celt codecs/mod_codec2 codecs/mod_ilbc codecs/mod_mp4v \
<span style="color: #A00000">- codecs/mod_silk codecs/mod_siren codecs/mod_theora"</span>
<span style="color: #00A000">+ codecs/mod_opus codecs/mod_silk codecs/mod_siren codecs/mod_theora "</span>
<span style="color: #00A000">+#</span>
<span style="color: #00A000">+%if %{build_sng_tc}</span>
<span style="color: #00A000">+CODECS_MODULES+="codecs/mod_sangoma_codec"</span>
<span style="color: #00A000">+%endif</span>
######################################################################################################################
#
# Dialplan Modules
<span style="color: #800080; font-weight: bold">@@ -377,7 +454,7 @@ DIRECTORIES_MODULES=""</span>
#
######################################################################################################################
ENDPOINTS_MODULES="endpoints/mod_dingaling endpoints/mod_loopback ../../libs/freetdm/mod_freetdm endpoints/mod_portaudio \
<span style="color: #A00000">- endpoints/mod_sofia"</span>
<span style="color: #00A000">+ endpoints/mod_sofia endpoints/mod_skinny endpoints/mod_skypopen"</span>
######################################################################################################################
#
<span style="color: #800080; font-weight: bold">@@ -483,11 +560,13 @@ fi</span>
%{?configure_options}
#Create the version header file here
<span style="color: #A00000">-cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/%{version}/g" > src/include/switch_version.h</span>
<span style="color: #A00000">-touch .noversion</span>
<span style="color: #00A000">+#cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/%{version}/g" > src/include/switch_version.h</span>
<span style="color: #00A000">+#touch .noversion</span>
%{__make}
<span style="color: #00A000">+cd libs/esl</span>
<span style="color: #00A000">+%{__make} pymod</span>
######################################################################################################################
#
<span style="color: #800080; font-weight: bold">@@ -503,6 +582,11 @@ touch .noversion</span>
%{__mkdir} -p %{buildroot}%{logfiledir}
%{__mkdir} -p %{buildroot}%{runtimedir}
<span style="color: #00A000">+#install the esl stuff</span>
<span style="color: #00A000">+cd libs/esl</span>
<span style="color: #00A000">+%{__make} DESTDIR=%{buildroot} pymod-install</span>
<span style="color: #00A000">+cd ../..</span>
<span style="color: #00A000">+</span>
%ifos linux
# Install init files
# On SuSE:
<span style="color: #800080; font-weight: bold">@@ -522,6 +606,23 @@ touch .noversion</span>
# Add monit file
%{__install} -D -m 644 build/freeswitch.monitrc %{buildroot}/etc/monit.d/freeswitch.monitrc
%endif
<span style="color: #00A000">+######################################################################################################################</span>
<span style="color: #00A000">+#</span>
<span style="color: #00A000">+# Remove files that are not wanted if they exist</span>
<span style="color: #00A000">+#</span>
<span style="color: #00A000">+######################################################################################################################</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+%if %{build_sng_ss7}</span>
<span style="color: #00A000">+#do not delete a thing</span>
<span style="color: #00A000">+%else</span>
<span style="color: #00A000">+rm %{prefix}/mod/ftdm_sangoma_ss7*</span>
<span style="color: #00A000">+%endif</span>
<span style="color: #00A000">+%if %{build_sng_isdn}</span>
<span style="color: #00A000">+#do not delete a thing</span>
<span style="color: #00A000">+%else</span>
<span style="color: #00A000">+rm %{prefix}/mod/ftdm_sangoma_isdn*</span>
<span style="color: #00A000">+%endif</span>
<span style="color: #00A000">+</span>
######################################################################################################################
<span style="color: #800080; font-weight: bold">@@ -545,8 +646,6 @@ fi</span>
chkconfig --add freeswitch
<span style="color: #A00000">-</span>
<span style="color: #A00000">-</span>
%postun
######################################################################################################################
#
<span style="color: #800080; font-weight: bold">@@ -790,6 +889,7 @@ fi</span>
%{prefix}/mod/mod_mp4v.so*
%{prefix}/mod/mod_native_file.so*
%{prefix}/mod/mod_nibblebill.so*
<span style="color: #00A000">+%{prefix}/mod/mod_opus.so*</span>
%{prefix}/mod/mod_pocketsphinx.so*
%{prefix}/mod/mod_portaudio.so*
%{prefix}/mod/mod_portaudio_stream.so*
<span style="color: #800080; font-weight: bold">@@ -798,6 +898,7 @@ fi</span>
%{prefix}/mod/mod_shout.so*
%{prefix}/mod/mod_silk.so*
%{prefix}/mod/mod_siren.so*
<span style="color: #00A000">+%{prefix}/mod/mod_skinny.so*</span>
%{prefix}/mod/mod_sndfile.so*
%{prefix}/mod/mod_snom.so*
%{prefix}/mod/mod_sofia.so*
<span style="color: #800080; font-weight: bold">@@ -831,7 +932,7 @@ fi</span>
%{prefix}/include/*.h
######################################################################################################################
#
<span style="color: #A00000">-# OpenZAP Module for TDM Interaction</span>
<span style="color: #00A000">+# FreeTDM Module for TDM Interaction</span>
#
######################################################################################################################
%files freetdm
<span style="color: #800080; font-weight: bold">@@ -844,7 +945,26 @@ fi</span>
%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/zt.conf
%{prefix}/lib/libfreetdm.so*
%{prefix}/mod/mod_freetdm.so*
<span style="color: #A00000">-%{prefix}/mod/ftm*.so*</span>
<span style="color: #00A000">+%{prefix}/mod/ftmod_skel*.so*</span>
<span style="color: #00A000">+%{prefix}/mod/ftmod_[a-r,t-z]*.so*</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+%if %{build_sng_tc}</span>
<span style="color: #00A000">+%files sangoma-codec</span>
<span style="color: #00A000">+%defattr(-, freeswitch, daemon)</span>
<span style="color: #00A000">+%{prefix}/mod/mod_sangoma_codec.so*</span>
<span style="color: #00A000">+%endif</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+%if %{build_sng_ss7}</span>
<span style="color: #00A000">+%files freetdm-sng-ss7</span>
<span style="color: #00A000">+%defattr(-, freeswitch, daemon)</span>
<span style="color: #00A000">+%{prefix}/mod/ftmod_sangoma_ss7.so*</span>
<span style="color: #00A000">+%endif</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+%if %{build_sng_isdn}</span>
<span style="color: #00A000">+%files freetdm-sng-isdn</span>
<span style="color: #00A000">+%defattr(-, freeswitch, daemon)</span>
<span style="color: #00A000">+%{prefix}/mod/ftmod_sangoma_isdn.so*</span>
<span style="color: #00A000">+%endif</span>
######################################################################################################################
#
<span style="color: #800080; font-weight: bold">@@ -899,9 +1019,13 @@ fi</span>
%defattr(-,freeswitch,daemon)
%{prefix}/mod/mod_python*.so*
%attr(0644, root, bin) /usr/lib/python*/site-packages/freeswitch.py*
<span style="color: #00A000">+%attr(0644, root, bin) /usr/lib/python*/site-packages/_ESL.so*</span>
%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/autoload_configs
%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/python.conf.xml
<span style="color: #00A000">+%files skypopen</span>
<span style="color: #00A000">+%defattr(-,freeswitch,daemon)</span>
<span style="color: #00A000">+%{prefix}/mod/mod_skypopen.so*</span>
######################################################################################################################
#
# Language Modules
<span style="color: #800080; font-weight: bold">@@ -956,6 +1080,17 @@ fi</span>
#
######################################################################################################################
%changelog
<span style="color: #00A000">+* Wed Feb 16 2011 - michal.bielicki@seventhsignal.de</span>
<span style="color: #00A000">+- added mod_skinny</span>
<span style="color: #00A000">+- added sangoma libraries</span>
<span style="color: #00A000">+- added sangoma codec module for D100 and D150 and D500</span>
<span style="color: #00A000">+- added skypopen module</span>
<span style="color: #00A000">+- fixes for ss7 freetdm modules</span>
<span style="color: #00A000">+- added mod_opus</span>
<span style="color: #00A000">+- added selector for sangoma modules</span>
<span style="color: #00A000">+- addded python esl module to rpm</span>
<span style="color: #00A000">+- some minor cleanups</span>
<span style="color: #00A000">+- cut sangoma modules into separate rpms as addons for freetdm</span>
* Tue Jan 18 2011 - michal.bielicki@seventhsignal.de
- Fedora adjustments
* Fri Oct 15 2010 - michal.bielicki@seventhsignal.de
<span style="color: #800080; font-weight: bold">@@ -1090,3 +1225,4 @@ fi</span>
- Added devel package
* Thu Mar 15 2007 - peter+rpmspam@suntel.com.tr
- Initial RPM release
<span style="color: #00A000">+</span>
<span style="color: #000080; font-weight: bold">diff --git a/libs/esl/python/Makefile b/libs/esl/python/Makefile</span>
<span style="color: #000080; font-weight: bold">index 0d9ca84..784426e 100644</span>
<span style="color: #A00000">--- a/libs/esl/python/Makefile</span>
<span style="color: #00A000">+++ b/libs/esl/python/Makefile</span>
<span style="color: #800080; font-weight: bold">@@ -14,7 +14,7 @@ _ESL.so: esl_wrap.o</span>
$(CXX) $(SOLINK) esl_wrap.o $(MYLIB) $(LOCAL_LDFLAGS) -o _ESL.so -L. $(LIBS)
install: _ESL.so
<span style="color: #A00000">- install -o root -g root -m 644 _ESL.so $(SITE_DIR)</span>
<span style="color: #00A000">+ install -m 755 _ESL.so $(SITE_DIR)</span>
clean:
rm -f *.o *.so *~
</pre></div>
========================================================================<pre>
Summary of changes:
freeswitch.spec | 162 ++++++++++++++++++++++++++++++++++++++++++----
libs/esl/python/Makefile | 2 +-
2 files changed, 150 insertions(+), 14 deletions(-)
</pre>
<p>this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email<br />
For more info, see <a href="http://blog.chomperstomp.com/?p=630">http://blog.chomperstomp.com/?p=630</a>
-- <br />
FreeSWITCH Source</p>