diff -r 45eaa38991fd -r 7c568c62ffb3 asterisk/asterisk.spec --- a/asterisk/asterisk.spec Thu Sep 15 19:34:00 2011 +0200 +++ b/asterisk/asterisk.spec Thu Sep 15 19:40:20 2011 +0200 @@ -22,8 +22,8 @@ ## # package version -%define V_opkg 1.8.4.2 -%define V_asterisk 1.8.4.2 +%define V_opkg 1.8.6.0 +%define V_asterisk 1.8.6.0 %define V_asterisk_fax_subdir 1.8.4 %define V_asterisk_fax_digium 1.8.4_1.3.0 %define V_asterisk_sounds_core 1.4.21 @@ -33,11 +33,11 @@ %define V_asterisk_sounds_custom 1.0 %define V_asterisk_sounds_mohop 2.03 %define V_asterisk_addons_mp3dec 1 -%define V_fswitch_sounds_en 1.0.14 -%define V_fswitch_sounds_ru 1.0.12 +%define V_fswitch_sounds_en 1.0.16 +%define V_fswitch_sounds_ru 1.0.13 %define V_fswitch_music 1.0.8 %define V_asterisk_codecs_ilbc 20110104 -%define V_chan_capi 1.1.5.919 +%define V_chan_capi 1.1.5.20110914 # package information Name: asterisk @@ -50,7 +50,7 @@ Group: VoIP License: GPL Version: %{V_opkg} -Release: 20110604 +Release: 20110916 # package options %option with_dahdi no @@ -78,29 +78,40 @@ Source0: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{V_asterisk}.tar.gz Source1: ftp://ftp.chan-capi.org/chan-capi/chan_capi-%{V_chan_capi}.tar.gz Source2: ftp://ftp.europalab.com/pub/sfw/machsnds/asterisk-moh-freeplay-sln16.tar.gz + Source3: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-sln16-%{V_asterisk_sounds_mohop}.tar.gz -Source4: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-%{V_asterisk_sounds_core}.tar.gz -Source5: http://downloads.asterisk.org/pub/telephony/sounds/asterisk-core-sounds-en_AU-sln16-current.tar.gz -Source6: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-%{V_asterisk_sounds_core}.tar.gz -Source7: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-%{V_asterisk_sounds_core}.tar.gz -Source8: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-sln16-%{V_asterisk_sounds_extra}.tar.gz -Source9: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-sln16-%{V_asterisk_sounds_extra}.tar.gz -Source10: http://www.amooma.de/asterisk/sprachbausteine/asterisk-%{V_asterisk_sounds_amoogab}-de-prompts.tar.gz -Source11: http://www.amooma.de/asterisk/sprachbausteine/asterisk-core-sounds-de-gsm-current.tar.gz -Source12: ftp://ftp.europalab.com/pub/sfw/machsnds/de-digits/de-digits-%{V_asterisk_sounds_custom}.tar.bz2 -Source13: ftp://ftp.europalab.com/pub/sfw/machsnds/de-sounds/astmultisnds-de-sln16-%{V_asterisk_sounds_custom}.tar.bz2 -Source14: ftp://ftp.europalab.com/pub/sfw/machsnds/msvbsnds-sln16-%{V_asterisk_sounds_custom}.tar.bz2 -Source15: http://files.freeswitch.org/freeswitch-sounds-en-us-callie-48000-%{V_fswitch_sounds_en}.tar.gz -Source16: http://files.freeswitch.org/freeswitch-sounds-es-mx-maria-44100.tar.gz -Source17: http://files.freeswitch.org/freeswitch-sounds-ru-RU-elena-48000-%{V_fswitch_sounds_ru}.tar.gz -Source18: http://files.freeswitch.org/freeswitch-sounds-music-48000-%{V_fswitch_music}.tar.gz -Source19: http://svn.digium.com/svn/thirdparty/mp3/trunk/addons/mp3-%{V_asterisk_addons_mp3dec}.tar.gz -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 -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 -Source22: ilbc-20110104.tar.gz -Source23: asterisk.txt -Source24: rc.asterisk -Source25: wakeup.agi +Source4: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-sln16-%{V_asterisk_sounds_mohop}.tar.gz.sha1 +Source5: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-%{V_asterisk_sounds_core}.tar.gz +Source6: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-%{V_asterisk_sounds_core}.tar.gz.sha1 +Source7: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-%{V_asterisk_sounds_core}.tar.gz +Source8: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-%{V_asterisk_sounds_core}.tar.gz.sha1 +Source9: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_AU-sln16-%{V_asterisk_sounds_core}.tar.gz +Source10: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_AU-sln16-%{V_asterisk_sounds_core}.tar.gz.sha1 +Source11: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-%{V_asterisk_sounds_core}.tar.gz +Source12: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-%{V_asterisk_sounds_core}.tar.gz.sha1 +Source13: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-sln16-%{V_asterisk_sounds_core}.tar.gz +Source14: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-sln16-%{V_asterisk_sounds_core}.tar.gz.sha1 +Source15: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-sln16-%{V_asterisk_sounds_extra}.tar.gz +Source16: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-sln16-%{V_asterisk_sounds_extra}.tar.gz.sha1 +Source16: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-sln16-%{V_asterisk_sounds_extra}.tar.gz +Source17: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-sln16-%{V_asterisk_sounds_extra}.tar.gz.sha1 + +Source18: http://www.amooma.de/asterisk/sprachbausteine/asterisk-%{V_asterisk_sounds_amoogab}-de-prompts.tar.gz +Source19: http://www.amooma.de/asterisk/sprachbausteine/asterisk-core-sounds-de-gsm-current.tar.gz +Source20: ftp://ftp.europalab.com/pub/sfw/machsnds/de-digits/de-digits-%{V_asterisk_sounds_custom}.tar.bz2 +Source21: ftp://ftp.europalab.com/pub/sfw/machsnds/de-sounds/astmultisnds-de-sln16-%{V_asterisk_sounds_custom}.tar.bz2 +Source22: ftp://ftp.europalab.com/pub/sfw/machsnds/msvbsnds-sln16-%{V_asterisk_sounds_custom}.tar.bz2 +Source23: http://files.freeswitch.org/freeswitch-sounds-en-us-callie-48000-%{V_fswitch_sounds_en}.tar.gz +Source24: http://files.freeswitch.org/freeswitch-sounds-es-mx-maria-44100.tar.gz +Source25: http://files.freeswitch.org/freeswitch-sounds-ru-RU-elena-48000-%{V_fswitch_sounds_ru}.tar.gz +Source26: http://files.freeswitch.org/freeswitch-sounds-music-48000-%{V_fswitch_music}.tar.gz +Source27: http://svn.digium.com/svn/thirdparty/mp3/trunk/addons/mp3-%{V_asterisk_addons_mp3dec}.tar.gz +Source28: 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 +Source29: 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 +Source30: ilbc-20110104.tar.gz +Source31: asterisk.txt +Source32: rc.asterisk +Source33: wakeup.agi Patch0: asterisk.patch Patch1: asterisk.patch.xfersips Patch2: asterisk.patch.proxymwi @@ -253,8 +264,8 @@ %setup -q -n asterisk-%{V_asterisk} -D -T -a 1 %setup -q -n asterisk-%{V_asterisk} -D -T -a 2 %if "%{with_fax}" == "yes" - %setup -q -n asterisk-%{V_asterisk} -D -T -a 20 - %setup -q -n asterisk-%{V_asterisk} -D -T -a 21 + %setup -q -n asterisk-%{V_asterisk} -D -T -a 28 + %setup -q -n asterisk-%{V_asterisk} -D -T -a 29 %endif ( cd addons %{l_tar} zxf %{_sourcedir}/mp3-%{V_asterisk_addons_mp3dec}.tar.gz @@ -291,6 +302,7 @@ -e 's;^\(#define DEFAULT_DB .*\${ASTDBDIR}\)/astdb;\1/asterisk.db;' \ build_tools/make_defaults_h %{l_shtool} subst \ + -e 's;^\(_all:.* *\)cleantest *;\1;' \ -e 's; *-I/usr/local/ssl/include;;g' \ -e 's;/opt/ssl/include;%{l_prefix}/include;g' \ -e 's;/usr/local;%{l_prefix};g' \ @@ -309,17 +321,12 @@ main/Makefile %{l_shtool} subst \ -e 's;\(\)no\(\);\1yes\2;g' \ - addons/.*.moduleinfo \ - apps/.app_ivrdemo.moduleinfo \ - apps/.app_saycounted.moduleinfo \ - apps/.app_rpt.moduleinfo \ - codecs/.moduleinfo \ + apps/app_ivrdemo.c \ + apps/app_saycounted.c \ + apps/app_rpt.c \ utils/utils.xml \ agi/agi.xml %{l_shtool} subst \ - -e 's;check_expr2;check_expr;g' \ - utils/utils.xml - %{l_shtool} subst \ -e 's;\(-DSOLARIS\);\1 -D__EXTENSIONS__=1;g' \ main/editline/Makefile.in \ main/db1-ast/Makefile @@ -333,10 +340,6 @@ -e 's;if \(((tmp = strchr(name\);while \1;g' \ main/abstract_jb.c %{l_shtool} subst \ - -e 's;\(CORE_SOUNDS_VERSION\):=.*$;\1:=%{V_asterisk_sounds_core};' \ - -e 's;\(EXTRA_SOUNDS_VERSION\):=.*$;\1:=%{V_asterisk_sounds_extra};' \ - sounds/Makefile - %{l_shtool} subst \ -e 's;\(/etc/radiusclient-ng/radiusclient.conf\);%{l_prefix}\1;g' \ -e 's;\(radiusclient\)-ng;\1;g' \ cdr/cdr_radius.c \ @@ -433,7 +436,7 @@ --localstatedir=%{l_prefix}/var \ --datarootdir=%{l_prefix}/share/asterisk \ --with-crypto=%{l_prefix} \ - --with-curl=%{l_prefix} \ + --with-libcurl=%{l_prefix} \ --with-ncurses=%{l_prefix} \ --with-gsm="internal" \ --with-popt=%{l_prefix} \ @@ -502,17 +505,18 @@ %else --without-imap \ %endif + --without-iodbc \ %if "%{with_odbc}" == "yes" - --with-odbc=%{l_prefix} \ + --with-unixodbc=%{l_prefix} \ %else - --without-odbc \ + --without-unixodbc \ %endif %if "%{with_libpri}" == "yes" --with-pri=%{l_prefix} \ %else --without-pri \ %endif - --with-sounds-cache=no \ + --with-sounds-cache=%_sourcedir \ --without-netsnmp \ --without-isdnnet \ --without-misdn \ @@ -527,35 +531,31 @@ --without-vpb \ --without-sdl \ --without-x11 \ - --without-gtk \ --without-gtk2 # build menuselect %{l_make} %{l_mflags -O} menuselect.makeopts - %{l_shtool} subst \ - -e 's;\(MENUSELECT_MOH=\).*;\1;' \ - -e 's;\(MENUSELECT_CORE_SOUNDS=\).*;\1;' \ - -e 's;\(MENUSELECT_EXTRA_SOUNDS=\).*;\1;' \ + menuselect/menuselect \ + --enable format_mp3 --enable app_fax --enable codec_ilbc \ + --enable RADIO_RELAX --enable G711_NEW_ALGORITHM \ + --enable G711_REDUCED_BRANCHING --enable CORE-SOUNDS-EN-SLN16 \ + --enable CORE-SOUNDS-ES-SLN16 --enable CORE-SOUNDS-FR-SLN16 \ + --enable CORE-SOUNDS-EN_AU-SLN16 --enable CORE-SOUNDS-RU-SLN16 \ + --enable MOH-OPSOUND-SLN16 --enable EXTRA-SOUNDS-EN-SLN16 \ + --enable EXTRA-SOUNDS-FR-SLN16 \ + menuselect.makeopts + menuselect/menuselect \ + --disable CORE-SOUNDS-EN-GSM \ + --disable MOH-OPSOUND-WAV \ menuselect.makeopts %if "%{with_imap}" == "yes" - %{l_shtool} subst \ - -e 's;\(MENUSELECT_OPTS_app_voicemail=\).*;\1IMAP_STORAGE;' \ - menuselect.makeopts + menuselect/menuselect --enable IMAP_STORAGE menuselect.makeopts %endif # build program %{l_make} %{l_mflags -O} \ CC="%{l_cc} $cflags -I../include -I../../include $cppflags" NOISY_BUILD=yes - # build addon modules - ( cd addons - %{l_make} %{l_mflags -O} \ - CC="%{l_cc} %{l_cflags -O} -I../../include %{l_cppflags ncurses}" NOISY_BUILD=yes ASTTOPDIR=.. - ) || exit $? - - # build agi programs - ( cd agi && %{l_make} %{l_mflags -O}) || exit $? - %if "%{with_capi}" == "yes" # build capi channel ( cd chan_capi-* @@ -574,14 +574,6 @@ DESTDIR=$RPM_BUILD_ROOT \ INSTALL_PREFIX=%{l_prefix} - # install addon modules - ( cd addons - %{l_make} %{l_mflags} install \ - ASTTOPDIR=.. \ - DESTDIR=$RPM_BUILD_ROOT \ - INSTALL_PREFIX=%{l_prefix} - ) || exit $? - %if "%{with_capi}" == "yes" # install capi channel ( cd chan_capi-* @@ -726,15 +718,19 @@ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/autosupport.8 >/dev/null 2>&1 || true rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/safe_asterisk.8 >/dev/null 2>&1 || true rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/images >/dev/null 2>&1 || true + rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/moh/.asterisk* >/dev/null 2>&1 || true rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/moh/CREDIT* >/dev/null 2>&1 || true rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/moh/CHANGES* >/dev/null 2>&1 || true + rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/moh/LICENSE* >/dev/null 2>&1 || true rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/*/CREDIT* >/dev/null 2>&1 || true rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/*/CHANGES* >/dev/null 2>&1 || true + rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/*/.asterisk* >/dev/null 2>&1 || true # create additional directories %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/db \ - $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/spool/facsimile \ + $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/spool/facsimile/rx \ + $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/spool/facsimile/tx \ $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/spool/outgoing \ $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/licenses @@ -786,8 +782,9 @@ # determine installation files %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ %{l_files_std} \ + '%config %attr(640,%{l_mgrp},%{l_rgrp}) %{l_prefix}/etc/asterisk/*' \ '%config %attr(-,%{l_mgrp},%{l_mgrp}) %{l_prefix}/share/asterisk/licenses' \ - '%config %attr(640,%{l_mgrp},%{l_rgrp}) %{l_prefix}/etc/asterisk/*' \ + '%attr(750,%{l_rgrp},%{l_rgrp}) %{l_prefix}/var/asterisk/spool/facsimile' \ '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/asterisk' # '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/share/asterisk/sounds/es/vm-Voicemail.sln16' \ @@ -838,7 +835,7 @@ ( echo "Asterisk has been installed with proprietary Digium fax support." echo "The responsible module is called res_fax_digium and requires a" echo "valid license. The license must be found in the directory" - echo "'licenses' which in turn must be found in $prefix/share/asterisk" + echo "'licenses' which in turn must be found in %{l_prefix}/share/asterisk" echo "or wherever astvarlibdir has been configured in 'asterisk.conf'." echo "" echo "Please see http://downloads.digium.com/pub/telephony/fax/ for information."