Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master 4.2 #2

Open
wants to merge 27 commits into
base: master-4.2
Choose a base branch
from
Open

Master 4.2 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
14d5a9a
new targets redhat55 and centos55 since centos and redhat version 5.5…
cypromis Aug 4, 2010
b6d49cf
added sipXacd dependency
Aug 10, 2010
980d04c
libww is dead, kicked it out of the centos5 and redhat5 dependencies …
cypromis Aug 4, 2010
b586816
install erlang before building freeswitch so events-erlang get build
Aug 9, 2010
0305507
ignore interactivity of yum
cypromis Aug 10, 2010
9910cc1
rubygems need to be installed before we can create gems. erlang rpm n…
Aug 30, 2010
3a29239
ok we should not depend on a -devel
cypromis Sep 7, 2010
553942b
Changed freeswitch to be checked out via git
Aug 3, 2010
96f9800
new targets redhat55 and centos55 since centos and redhat version 5.5…
cypromis Aug 4, 2010
9ce3fe3
adding asciidoc, erlang and rsyslog to libs. RPM building will be ad…
cypromis Aug 5, 2010
f6f6cc2
added final erlang spec
cypromis Aug 6, 2010
5637614
install erlang before building freeswitch so events-erlang get build
Aug 9, 2010
fddcee3
added sipXacd dependency
Aug 10, 2010
62ff5e2
ignore interactivity of yum
cypromis Aug 10, 2010
8883ee1
rubygems need to be installed before we can create gems. erlang rpm n…
Aug 30, 2010
6a12a99
libww is dead, kicked it out of the centos5 and redhat5 dependencies …
cypromis Aug 4, 2010
4668804
dependencies fixed for centos5
cypromis Aug 5, 2010
b106af4
added final erlang spec
cypromis Aug 6, 2010
213eff2
install erlang before building freeswitch so events-erlang get build
Aug 9, 2010
352f9b7
ignore interactivity of yum
cypromis Aug 10, 2010
1fc4ba6
rubygems need to be installed before we can create gems. erlang rpm n…
Aug 30, 2010
f5c5776
ok we should not depend on a -devel
cypromis Sep 7, 2010
d96a37d
add portaudio-stream and portaudio modules back to freeswitch rpm and…
cypromis Sep 27, 2010
dc502a9
made rsyslog copy mobth modules to the right rpm directory
cypromis Oct 9, 2010
0e30317
new codecs, freetdm support Phase I and addition of all standard modu…
cypromis Oct 9, 2010
5f72b6a
freeswitch source is bzipped and not gzipped
cypromis Oct 9, 2010
24136a9
add docbook-style-dsssl to BuildRequire: for sipXtools on non suse rp…
cypromis Oct 15, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions lib/freeswitch/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,27 @@ G723_RPM = $(DEST_RPM)/sipx-freeswitch-codec-passthru-g723_1-$(VERSION)-$(RELEAS
G729_RPM = $(DEST_RPM)/sipx-freeswitch-codec-passthru-g729-$(VERSION)-$(RELEASE).@[email protected]
EN_RPM = $(DEST_RPM)/sipx-freeswitch-lang-en-$(VERSION)-$(RELEASE).@[email protected]
DE_RPM = $(DEST_RPM)/sipx-freeswitch-lang-de-$(VERSION)-$(RELEASE).@[email protected]
FR_RPM = $(DEST_RPM)/sipx-freeswitch-lang-fr-$(VERSION)-$(RELEASE).@[email protected]
RU_RPM = $(DEST_RPM)/sipx-freeswitch-lang-ru-$(VERSION)-$(RELEASE).@[email protected]
LUA_RPM = $(DEST_RPM)/sipx-freeswitch-lua-$(VERSION)-$(RELEASE).@[email protected]
RPMS = $(RPM) $(DEVEL_RPM) $(AMR_RPM) $(AMRWB_RPM) $(G723_RPM) $(G729_RPM) $(EN_RPM) $(DE_RPM) $(LUA_RPM)
PERL_RPM = $(DEST_RPM)/sipx-freeswitch-perl-$(VERSION)-$(RELEASE).@[email protected]
JS_RPM = $(DEST_RPM)/sipx-freeswitch-spidermonkey-$(VERSION)-$(RELEASE).@[email protected]
PYTHON_RPM = $(DEST_RPM)/sipx-freeswitch-python-$(VERSION)-$(RELEASE).@[email protected]
FREETDM_RPM = $(DEST_RPM)/sipx-freeswitch-freetdm-$(VERSION)-$(RELEASE).@[email protected]
RPMS = $(RPM) $(DEVEL_RPM) $(AMR_RPM) $(AMRWB_RPM) $(G723_RPM) $(G729_RPM) $(EN_RPM) $(DE_RPM) $(LUA_RPM) $(FR_RPM) $(RU_RPM) $(JS_RPM) $(PERL_RPM) $(PYTHON_RPM) $(FREETDM_RPM)

all : PRINT_HEADER $(RPMS) PRINT_FOOTER

.PHONY: build-rpms
build-rpms:
pushd @RPMBUILD_TOPDIR@/SOURCES ; \
git clone $(GIT_URL) sipx-freeswitch-$(VERSION) ; \
git clone $(GIT_URL) sipx-freeswitch-$(VERSION) ; \
cd sipx-freeswitch-$(VERSION) ; \
git archive --format tar --prefix sipx-freeswitch-$(VERSION)/ $(GIT_RELEASE)| bzip2 > ../$(SRC_TARBALL) ; \
cd .. ; \
rm -rf sipx-freeswitch-$(VERSION) ; \
popd
cp $(SRC_DIR)/*.gz @RPMBUILD_TOPDIR@/SOURCES/
cp $(srcdir)/$(SPEC_FILE) @RPMBUILD_TOPDIR@/SPECS/
QA_RPATHS=0x0003 rpmbuild -ba \
--define 'VERSION $(VERSION)' \
Expand Down
131 changes: 72 additions & 59 deletions lib/freeswitch/sipx-freeswitch.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#
# includes module(s): freeswitch-devel freeswitch-codec-passthru-amr freeswitch-codec-passthru-amrwb freeswitch-codec-passthru-g729
# freeswitch-codec-passthru-g7231 freeswitch-lua freeswitch-perl freeswitch-python freeswitch-spidermonkey
# freeswitch-lan-de freeswitch-lang-en freeswitch-lang-fr freeswitch-lang-ru freeswitch-openzap
# freeswitch-lan-de freeswitch-lang-en freeswitch-lang-fr freeswitch-lang-ru freeswitch-freetdm
#
# Initial Version Copyright (C) 2007 Peter Nixon and Michal Bielicki, All Rights Reserved.
#
Expand Down Expand Up @@ -54,19 +54,19 @@ Vendor: http://www.freeswitch.org/
# Source files and where to get them
#
###############################################################################################################################
Source0: %name-%version.tar.gz
#Source1: http://files.freeswitch.org/downloads/libs/celt-0.7.0.tar.gz
#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
#Source5: http://files.freeswitch.org/downloads/libs/mpg123.tar.gz
#Source6: http://files.freeswitch.org/downloads/libs/openldap-2.4.11.tar.gz
# Source7: http://files.freeswitch.org/downloads/libs/pocketsphinx-0.5.99-20091212.tar.gz
# Source8: http://files.freeswitch.org/downloads/libs/soundtouch-1.3.1.tar.gz
# 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
Prefix: %{prefix}
Source0: %name-%version.tar.bz2
Source1: http://files.freeswitch.org/downloads/libs/celt-0.7.1.tar.gz
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
Source5: http://files.freeswitch.org/downloads/libs/mpg123.tar.gz
Source6: http://files.freeswitch.org/downloads/libs/openldap-2.4.11.tar.gz
Source7: http://files.freeswitch.org/downloads/libs/pocketsphinx-0.5.99-20091212.tar.gz
Source8: http://files.freeswitch.org/downloads/libs/soundtouch-1.3.1.tar.gz
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
Prefix: %{prefix}


###############################################################################################################################
Expand Down Expand Up @@ -111,6 +111,7 @@ BuildRequires: alsa-lib-devel
BuildRequires: which
BuildRequires: zlib-devel
BuildRequires: e2fsprogs-devel
BuildRequires: libtheora-devel
BuildRequires: erlang
Requires: alsa-lib
Requires: libogg
Expand All @@ -124,12 +125,10 @@ Requires: openldap
Requires: db4
Requires: gdbm
Requires: zlib
Requires: erlang
Requires: libtiff
Requires: libjpeg
Requires: erlang
Requires: zlib
Requires: python
Requires: erlang
Requires: libtheora

%if %{?suse_version:1}0
%if 0%{?suse_version} > 910
Expand Down Expand Up @@ -284,13 +283,13 @@ Group: System/LibrariesRequires: %{name} = %{version}-%{release}
German language phrases module and directory structure for say module and voicemail


%package openzap
%package freetdm
Summary: Provides a unified interface to hardware TDM cards and ss7 stacks for FreeSWITCH
Group: System/Libraries
Requires: %{name} = %{version}-%{release}

%description openzap
OpenZAP
%description freetdm


###############################################################################################################################
#
Expand All @@ -300,17 +299,17 @@ OpenZAP

%prep
%setup -b0 -q
#cp %{SOURCE1} libs/
#cp %{SOURCE2} libs/
#cp %{SOURCE3} libs/
#cp %{SOURCE4} libs/
#cp %{SOURCE5} libs/
#cp %{SOURCE6} libs/
#cp %{SOURCE7} libs/
#cp %{SOURCE8} libs/
#cp %{SOURCE9} libs/
#cp %{SOURCE10} libs/
#cp %{SOURCE11} libs/
cp %{SOURCE1} libs/
cp %{SOURCE2} libs/
cp %{SOURCE3} libs/
cp %{SOURCE4} libs/
cp %{SOURCE5} libs/
cp %{SOURCE6} libs/
cp %{SOURCE7} libs/
cp %{SOURCE8} libs/
cp %{SOURCE9} libs/
cp %{SOURCE10} libs/
cp %{SOURCE11} libs/

###############################################################################################################################
#
Expand All @@ -337,12 +336,14 @@ export QA_RPATHS=$[ 0x0001|0x0002 ]
# Application Modules
#
###############################################################################################################################
APPLICATION_MODULES_AE="applications/mod_avmd applications/mod_commands applications/mod_conference applications/mod_db applications/mod_directory applications/mod_distributor applications/mod_dptools applications/mod_easyroute applications/mod_enum applications/mod_esf applications/mod_expr"

APPLICATION_MODULES_FM="applications/mod_fifo applications/mod_fsv applications/mod_hash applications/mod_lcr applications/mod_limit"
# applications/mod_memcache
APPLICATION_MODULES_NY="applications/mod_redis applications/mod_rss applications/mod_spandsp applications/mod_stress applications/mod_spy " # applications/mod_soundtouch

APPLICATION_MODULES_AE="applications/mod_avmd applications/mod_callcenter applications/mod_cidlookup applications/mod_cluechoo \
applications/mod_commands applications/mod_conference applications/mod_db applications/mod_directory \
applications/mod_distributor applications/mod_dptools applications/mod_easyroute applications/mod_enum \
applications/mod_esf applications/mod_expr"
APPLICATION_MODULES_FM="applications/mod_fifo applications/mod_fsv applications/mod_hash applications/mod_lcr applications/mod_limit \
applications/mod_memcache"
APPLICATION_MODULES_NY="application/mod_nibblebill applications/mod_redis applications/mod_rss applications/mod_snom \
applications/mod_soundtouch applications/mod_spandsp applications/mod_spy applications/mod_stress"
APPLICATION_MODULES_VZ="applications/mod_valet_parking applications/mod_vmd applications/mod_voicemail"

APPLICATIONS_MODULES="$APPLICATION_MODULES_AE $APPLICATION_MODULES_FM $APPLICATION_MODULES_NY $APPLICATION_MODULES_VZ"
Expand All @@ -351,13 +352,14 @@ APPLICATIONS_MODULES="$APPLICATION_MODULES_AE $APPLICATION_MODULES_FM $APPLICATI
# Automatic Speech Recognition and Text To Speech Modules
#
###############################################################################################################################
ASR_TTS_MODULES="asr_tts/mod_unimrcp" #asr_tts/mod_pocketsphinx asr_tts/mod_flite
ASR_TTS_MODULES="asr_tts/mod_flite asr_tts/mod_pocketsphinx asr_tts/mod_unimrcp"
###############################################################################################################################
#
# Codecs
#
###############################################################################################################################
CODECS_MODULES="codecs/mod_ilbc codecs/mod_h26x codecs/mod_speex codecs/mod_celt codecs/mod_siren codecs/mod_bv"
CODECS_MODULES="codecs/mod_bv codecs/mod_h26x codecs/mod_speex codecs/mod_celt codecs/mod_codec2 codecs/mod_ilbc codecs/mod_mp4v \
codecs/mod_silk codecs/mod_siren codecs/mod_theora"
###############################################################################################################################
#
# Dialplan Modules
Expand All @@ -375,20 +377,23 @@ DIRECTORIES_MODULES=""
# Endpoints
#
###############################################################################################################################
ENDPOINTS_MODULES="endpoints/mod_dingaling endpoints/mod_sofia ../../libs/openzap/mod_openzap endpoints/mod_loopback endpoints/mod_portaudio"
ENDPOINTS_MODULES="endpoints/mod_dingaling endpoints/mod_loopback ../../libs/freetdm/mod_freetdm endpoints/mod_portaudio \
endpoints/mod_sofia"

###############################################################################################################################
#
# Event Handlers
#
###############################################################################################################################
EVENT_HANDLERS_MODULES="event_handlers/mod_event_multicast event_handlers/mod_event_socket event_handlers/mod_cdr_csv event_handlers/mod_erlang_event"
EVENT_HANDLERS_MODULES="event_handlers/mod_cdr_csv event_handlers/mod_event_socket event_handlers/mod_event_multicast \
event_handlers/mod_erlang_event"
###############################################################################################################################
#
# File and Audio Format Handlers
#
###############################################################################################################################
FORMATS_MODULES="formats/mod_local_stream formats/mod_native_file formats/mod_sndfile formats/mod_tone_stream formats/mod_file_string formats/mod_portaudio_stream"
# formats/mod_shout
FORMATS_MODULES="formats/mod_file_string formats/mod_local_stream formats/mod_native_file formats/mod_portaudio_stream \
formats/mod_shout formats/mod_sndfile formats/mod_tone_stream"
###############################################################################################################################
#
# Embedded Languages
Expand Down Expand Up @@ -512,7 +517,7 @@ fi
%post
%{?run_ldconfig:%run_ldconfig}
# Make FHS2.0 happy
%{__mkdir} -p /etc/opt
#%{__mkdir} -p /etc/opt
# ERROR: parent directory of /etc%{prefix} doesnt exist and probably not what was intended
#%{__ln_s} -f %{prefix}/conf /etc%{prefix}

Expand Down Expand Up @@ -685,9 +690,9 @@ fi
# Grammar Files
#
###############################################################################################################################
#%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/grammar/default.dic
#%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/grammar/model/communicator/*
#%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/grammar/model/wsj1/*
%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/grammar/default.dic
%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/grammar/model/communicator/*
%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/grammar/model/wsj1/*
###############################################################################################################################
#
# Other Fíles
Expand Down Expand Up @@ -720,8 +725,12 @@ fi
%{prefix}/mod/mod_amrwb.so*
%{prefix}/mod/mod_avmd.so*
%{prefix}/mod/mod_bv.so*
%{prefix}/mod/mod_callcenter.so*
%{prefix}/mod/mod_cdr_csv.so*
%{prefix}/mod/mod_celt.so*
%{prefix}/mod/mod_cidlookup.so*
%{prefix}/mod/mod_cluechoo.so*
%{prefix}/mod/mod_codec2.so*
%{prefix}/mod/mod_console.so*
%{prefix}/mod/mod_commands.so*
%{prefix}/mod/mod_conference.so*
Expand All @@ -742,7 +751,7 @@ fi
%{prefix}/mod/mod_expr.so*
%{prefix}/mod/mod_fifo.so*
%{prefix}/mod/mod_file_string.so*
#%{prefix}/mod/mod_flite.so*
%{prefix}/mod/mod_flite.so*
%{prefix}/mod/mod_fsv.so*
%{prefix}/mod/mod_hash.so*
%{prefix}/mod/mod_h26x.so*
Expand All @@ -752,23 +761,27 @@ fi
%{prefix}/mod/mod_local_stream.so*
%{prefix}/mod/mod_logfile.so*
%{prefix}/mod/mod_loopback.so*
#%{prefix}/mod/mod_memcache.so*
%{prefix}/mod/mod_memcache.so*
%{prefix}/mod/mod_mp4v.so*
%{prefix}/mod/mod_native_file.so*
#%{prefix}/mod/mod_pocketsphinx.so*
%{prefix}/mod/mod_pocketsphinx.so*
%{prefix}/mod/mod_portaudio.so*
%{prefix}/mod/mod_portaudio_stream.so*
%{prefix}/mod/mod_redis.so*
%{prefix}/mod/mod_rss.so*
#%{prefix}/mod/mod_shout.so*
%{prefix}/mod/mod_shout.so*
%{prefix}/mod/mod_silk.so*
%{prefix}/mod/mod_siren.so*
%{prefix}/mod/mod_sndfile.so*
%{prefix}/mod/mod_snom.so*
%{prefix}/mod/mod_sofia.so*
#%{prefix}/mod/mod_soundtouch.so*
%{prefix}/mod/mod_soundtouch.so*
%{prefix}/mod/mod_spandsp.so*
%{prefix}/mod/mod_speex.so*
%{prefix}/mod/mod_spy.so*
%{prefix}/mod/mod_stress.so*
%{prefix}/mod/mod_syslog.so*
%{prefix}/mod/mod_theora.so*
%{prefix}/mod/mod_tone_stream.so*
%{prefix}/mod/mod_unimrcp.so*
%{prefix}/mod/mod_valet_parking.so*
Expand Down Expand Up @@ -798,17 +811,17 @@ fi
# OpenZAP Module for TDM Interaction
#
###############################################################################################################################
%files openzap
%files freetdm
%defattr(-, freeswitch, daemon)
%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/tones.conf
%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/openzap.conf.xml
%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/freetdm.conf.xml
%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/pika.conf
%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/openzap.conf
%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/freetdm.conf
%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/wanpipe.conf
%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/zt.conf
%{prefix}/lib/libopenzap.so*
%{prefix}/mod/mod_openzap.so*
%{prefix}/mod/ozmod_*.so*
%{prefix}/lib/libfreetdm.so*
%{prefix}/mod/mod_freetdm.so*
%{prefix}/mod/ftm*.so*

###############################################################################################################################
#
Expand Down
Binary file added lib/freeswitch/src/communicator_semi_6000_20080321.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file added lib/freeswitch/src/flite-1.3.99-latest.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file added lib/freeswitch/src/lame-3.97.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file added lib/freeswitch/src/libmemcached-0.32.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file added lib/freeswitch/src/libshout-2.2.2.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file added lib/freeswitch/src/mpg123.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file added lib/freeswitch/src/openldap-2.4.11.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file added lib/freeswitch/src/pocketsphinx-0.5.99-20091212.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file added lib/freeswitch/src/soundtouch-1.3.1.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file added lib/freeswitch/src/sphinxbase-0.4.99-20091212.tar.gz
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion lib/rsyslog/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ SRC_DIR = $(srcdir)/src
SRC_TARBALL = rsyslog-$(VERSION).tar.gz
SRPM = $(DEST_SRPM)/rsyslog-$(VERSION)-$(RELEASE).src.rpm
RPMS = $(DEST_RPM)/rsyslog-$(VERSION)-$(RELEASE).@[email protected] \
$(DEST_RPM)/rsyslog-pgsql-$(VERSION)-$(RELEASE).@[email protected]
$(DEST_RPM)/rsyslog-pgsql-$(VERSION)-$(RELEASE).@[email protected] \
$(DEST_RPM)/rsyslog-mysql-$(VERSION)-$(RELEASE).@[email protected]


SPEC_FILE = rsyslog.spec

Expand Down
1 change: 1 addition & 0 deletions sipXtools/sipxtools.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ BuildRequires: asciidoc
BuildRequires: docbook-xsl-stylesheets
%else
BuildRequires: docbook-style-xsl
BuildRequires: docbook-style-dsssl
%endif

Source: %name-%version.tar.gz
Expand Down