1.1 --- a/asterisk/asterisk.spec Sun May 29 17:14:31 2011 +0200
1.2 +++ b/asterisk/asterisk.spec Sun Jun 05 11:43:33 2011 +0200
1.3 @@ -22,10 +22,11 @@
1.4 ##
1.5
1.6 # package version
1.7 -%define V_opkg 1.8.3.2
1.8 -%define V_asterisk 1.8.3.2
1.9 -%define V_asterisk_fax_digium 1.8.0_1.3.0
1.10 -%define V_asterisk_sounds_core 1.4.20
1.11 +%define V_opkg 1.8.4.2
1.12 +%define V_asterisk 1.8.4.2
1.13 +%define V_asterisk_fax_subdir 1.8.4
1.14 +%define V_asterisk_fax_digium 1.8.4_1.3.0
1.15 +%define V_asterisk_sounds_core 1.4.21
1.16 %define V_asterisk_sounds_extra 1.4.11
1.17 %define V_asterisk_sounds_amoogab 1.4
1.18 %define V_asterisk_sounds_amootts current
1.19 @@ -49,7 +50,7 @@
1.20 Group: VoIP
1.21 License: GPL
1.22 Version: %{V_opkg}
1.23 -Release: 20110316
1.24 +Release: 20110602
1.25
1.26 # package options
1.27 %option with_dahdi no
1.28 @@ -94,8 +95,8 @@
1.29 Source17: http://files.freeswitch.org/freeswitch-sounds-ru-RU-elena-48000-%{V_fswitch_sounds_ru}.tar.gz
1.30 Source18: http://files.freeswitch.org/freeswitch-sounds-music-48000-%{V_fswitch_music}.tar.gz
1.31 Source19: http://svn.digium.com/svn/thirdparty/mp3/trunk/addons/mp3-%{V_asterisk_addons_mp3dec}.tar.gz
1.32 -Source20: http://downloads.digium.com/pub/telephony/fax/res_fax_digium/asterisk-1.8.0/x86-64/res_fax_digium-%{V_asterisk_fax_digium}-generic_64.tar.gz
1.33 -Source21: http://downloads.digium.com/pub/telephony/fax/res_fax_digium/asterisk-1.8.0/x86-32/res_fax_digium-%{V_asterisk_fax_digium}-generic_32.tar.gz
1.34 +Source20: http://downloads.digium.com/pub/telephony/fax/res_fax_digium/asterisk-%{V_asterisk_fax_subdir}/x86-64/res_fax_digium-%{V_asterisk_fax_digium}-generic_64.tar.gz
1.35 +Source21: http://downloads.digium.com/pub/telephony/fax/res_fax_digium/asterisk-%{V_asterisk_fax_subdir}/x86-32/res_fax_digium-%{V_asterisk_fax_digium}-generic_32.tar.gz
1.36 Source22: ilbc-20110104.tar.gz
1.37 Source23: asterisk.txt
1.38 Source24: rc.asterisk
1.39 @@ -107,7 +108,7 @@
1.40 # build information
1.41 Prefix: %{l_prefix}
1.42 BuildRoot: %{l_buildroot}
1.43 -BuildPreReq: OpenPKG, openpkg >= 20040130, bison, gcc, make, grep
1.44 +BuildPreReq: OpenPKG, openpkg >= 20040130, bison, gcc, make, grep, pkgconfig
1.45 PreReq: OpenPKG, openpkg >= 20040130, MTA
1.46 BuildPreReq: zlib, curl, openssl, ncurses, speex, sox, popt, gmime, libxml
1.47 PreReq: zlib, curl, openssl, ncurses, speex, sox, popt, gmime, libxml
1.48 @@ -276,8 +277,6 @@
1.49 -e 's;\(dir=.*{localstatedir}\)/\([^/][^/]*\)/asterisk;\1/asterisk/\2;g' \
1.50 configure
1.51 %{l_shtool} subst \
1.52 - -e 's;-llua5\.1;-llua;' \
1.53 - -e 's;lua5\.1/lua\.h;lua/lua.h;' \
1.54 -e 's;ffmpeg/avcodec\.h;libavcodec/avcodec.h;' \
1.55 -e 's;\(sqlite\)\(_exec\);\13\2;g' \
1.56 -e 's;-lradiusclient-ng;-lradiusclient;g' \
1.57 @@ -657,6 +656,7 @@
1.58 mv -f music/48000/* . && rm -rf music
1.59
1.60 # convert freeswitch 48000 and 441000 KHz to 8000 Khz
1.61 + # ffmpeg -i <in> -ar 8000 -ac 1 -acodec pcm_s16le -f s16le <out>
1.62 cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk
1.63 for highfile in `find . -name '*.wav'`; do
1.64 lowfile=`echo $highfile | sed -e 's;\(.*\)\.wav;\1.sln16;'`
1.65 @@ -691,6 +691,7 @@
1.66 #mv -f phonetic/de/* de/phonetic/ && rm -rf phonetic/de
1.67 %{l_tar} jxf %{SOURCE astmultisnds-de-sln16-%{V_asterisk_sounds_custom}.tar.bz2}
1.68 %{l_tar} jxf %{SOURCE msvbsnds-sln16-%{V_asterisk_sounds_custom}.tar.bz2}
1.69 + mv msvbsnds-sln16-%{V_asterisk_sounds_custom} msvb
1.70
1.71 # install additional asterisk music on hold
1.72 cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/moh
1.73 @@ -733,8 +734,8 @@
1.74 # create additional directories
1.75 %{l_shtool} mkdir -f -p -m 755 \
1.76 $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/db \
1.77 - $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/lib/licenses \
1.78 - $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/spool/outgoing
1.79 + $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/spool/outgoing \
1.80 + $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/licenses
1.81
1.82 # postadjust installation
1.83 strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* \
1.84 @@ -784,7 +785,7 @@
1.85 # determine installation files
1.86 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
1.87 %{l_files_std} \
1.88 - '%config %{l_prefix}/var/asterisk/lib/licenses' \
1.89 + '%config %attr(-,%{l_mgrp},%{l_mgrp}) %{l_prefix}/share/asterisk/licenses' \
1.90 '%config %attr(640,%{l_mgrp},%{l_rgrp}) %{l_prefix}/etc/asterisk/*' \
1.91 '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/asterisk'
1.92
1.93 @@ -836,7 +837,7 @@
1.94 ( echo "Asterisk has been installed with proprietary Digium fax support."
1.95 echo "The responsible module is called res_fax_digium and requires a"
1.96 echo "valid license. The license must be found in the directory"
1.97 - echo "'licenses' which in turn must be found in $prefix/var/asterisk/lib"
1.98 + echo "'licenses' which in turn must be found in $prefix/share/asterisk"
1.99 echo "or wherever astvarlibdir has been configured in 'asterisk.conf'."
1.100 echo ""
1.101 echo "Please see http://downloads.digium.com/pub/telephony/fax/ for information."
