diff -r d7ae7fd8a214 -r e568963742d6 asterisk/asterisk.spec --- a/asterisk/asterisk.spec Tue Aug 28 18:32:00 2012 +0200 +++ b/asterisk/asterisk.spec Tue Aug 28 18:32:05 2012 +0200 @@ -22,23 +22,24 @@ ## # package version -%define V_opkg 1.8.11.0 -%define V_asterisk 1.8.11.0 +%define V_opkg 1.8.15.0 +%define V_asterisk 1.8.15.0 %define V_asterisk_fax_subdir 1.8.4 -%define V_asterisk_fax_digium 1.8.4_1.3.0 +%define V_asterisk_fax_digium 1.8.4_1.3.1 %define V_asterisk_sounds_core 1.4.22 %define V_asterisk_sounds_extra 1.4.11 %define V_asterisk_sounds_amoogab 1.4 %define V_asterisk_sounds_amootts current %define V_asterisk_sounds_custom 1.0 %define V_asterisk_sounds_mohop 2.03 +%define V_asterisk_sounds_newpro july_2012 %define V_asterisk_addons_mp3dec 1 -%define V_fswitch_sounds_en 1.0.16 -%define V_fswitch_sounds_fr 1.0.14 +%define V_fswitch_sounds_en 1.0.20 +%define V_fswitch_sounds_fr 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.20120324 +%define V_chan_capi 1.1.5.20120615 # package information Name: asterisk @@ -51,7 +52,7 @@ Group: VoIP License: GPL Version: %{V_opkg} -Release: 20120330 +Release: 20120800 # package options %option with_dahdi no @@ -80,7 +81,6 @@ 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/releases/asterisk-core-sounds-es-sln16-%{V_asterisk_sounds_core}.tar.gz @@ -89,32 +89,31 @@ Source8: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-sln16-%{V_asterisk_sounds_core}.tar.gz Source9: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-sln16-%{V_asterisk_sounds_extra}.tar.gz Source10: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-sln16-%{V_asterisk_sounds_extra}.tar.gz -Source11: http://www.amooma.de/asterisk/sprachbausteine/asterisk-%{V_asterisk_sounds_amoogab}-de-prompts.tar.gz -Source12: http://www.amooma.de/asterisk/sprachbausteine/asterisk-core-sounds-de-gsm-current.tar.gz -Source13: ftp://ftp.europalab.com/pub/sfw/machsnds/de-digits/de-digits-%{V_asterisk_sounds_custom}.tar.bz2 -Source14: ftp://ftp.europalab.com/pub/sfw/machsnds/de-sounds/astmultisnds-de-sln16-%{V_asterisk_sounds_custom}.tar.bz2 -Source15: ftp://ftp.europalab.com/pub/sfw/machsnds/msvbsnds-sln16-%{V_asterisk_sounds_custom}.tar.bz2 -Source16: http://files.freeswitch.org/freeswitch-sounds-en-us-callie-48000-%{V_fswitch_sounds_en}.tar.gz -Source17: http://files.freeswitch.org/freeswitch-sounds-es-mx-maria-44100.tar.gz -Source18: http://files.freeswitch.org/freeswitch-sounds-fr-ca-june-48000-%{V_fswitch_sounds_fr}.tar.gz -Source19: http://files.freeswitch.org/freeswitch-sounds-ru-RU-elena-48000-%{V_fswitch_sounds_ru}.tar.gz -Source20: http://files.freeswitch.org/freeswitch-sounds-music-48000-%{V_fswitch_music}.tar.gz -Source21: http://svn.digium.com/svn/thirdparty/mp3/trunk/addons/mp3-%{V_asterisk_addons_mp3dec}.tar.gz -Source22: 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 -Source23: 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 -Source24: ilbc-20110104.tar.gz -Source25: asterisk.txt -Source26: rc.asterisk -Source27: wakeup.agi +Source11: http://www.asterisk.org/files/new_prompts_%{V_asterisk_sounds_newpro}.zip +Source12: http://www.amooma.de/asterisk/sprachbausteine/asterisk-%{V_asterisk_sounds_amoogab}-de-prompts.tar.gz +Source13: http://www.amooma.de/asterisk/sprachbausteine/asterisk-core-sounds-de-gsm-current.tar.gz +Source14: ftp://ftp.europalab.com/pub/sfw/machsnds/de-digits/de-digits-%{V_asterisk_sounds_custom}.tar.bz2 +Source15: ftp://ftp.europalab.com/pub/sfw/machsnds/de-sounds/astmultisnds-de-sln16-%{V_asterisk_sounds_custom}.tar.bz2 +Source16: ftp://ftp.europalab.com/pub/sfw/machsnds/msvbsnds-sln16-%{V_asterisk_sounds_custom}.tar.bz2 +Source17: http://files.freeswitch.org/freeswitch-sounds-en-us-callie-48000-%{V_fswitch_sounds_en}.tar.gz +Source18: http://files.freeswitch.org/freeswitch-sounds-es-mx-maria-44100.tar.gz +Source19: http://files.freeswitch.org/freeswitch-sounds-fr-ca-june-48000-%{V_fswitch_sounds_fr}.tar.gz +Source20: http://files.freeswitch.org/freeswitch-sounds-ru-RU-elena-48000-%{V_fswitch_sounds_ru}.tar.gz +Source21: http://files.freeswitch.org/freeswitch-sounds-music-48000-%{V_fswitch_music}.tar.gz +Source22: http://svn.digium.com/svn/thirdparty/mp3/trunk/addons/mp3-%{V_asterisk_addons_mp3dec}.tar.gz +Source23: 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 +Source24: 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 +Source25: ilbc-%{V_asterisk_codecs_ilbc}.tar.gz +Source26: asterisk.txt +Source27: rc.asterisk +Source28: wakeup.agi Patch0: asterisk.patch Patch1: asterisk.patch.xfersips Patch2: asterisk.patch.proxymwi # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20060823, bison, gcc, make, grep, pkgconfig -PreReq: OpenPKG, openpkg >= 20060823, MTA +BuildPreReq: OpenPKG, openpkg >= 20100101, bison, gcc, make, grep, pkgconfig +PreReq: OpenPKG, openpkg >= 20100101, MTA BuildPreReq: zlib, curl, openssl, ncurses, speex, sox, popt, gmime, libxml PreReq: zlib, curl, openssl, ncurses, speex, sox, popt, gmime, libxml %if "%{with_ogg}" == "yes" @@ -172,10 +171,8 @@ PreReq: libpri > 1.4.11.5 %endif %if "%{with_esounds}" == "yes" -BuildPreReq: sox +BuildPreReq: sox, infozip %endif -AutoReq: no -AutoReqProv: no %description Asterisk is a complete Private Branch Exchange (PBX) in software. @@ -220,6 +217,11 @@ url = http://downloads.asterisk.org/pub/telephony/sounds/releases/ regex = asterisk-core-sounds-en-sln16-(\d+\.\d+(\.\d+)+)\.tar\.gz } + prog asterisk:sounds_newpro = { + version = %{V_asterisk_sounds_newpro} + url = http://www.asterisk.org/files/ + regex = new_prompts_(__VER__)\.zip + } prog asterisk:sounds_extra = { version = %{V_asterisk_sounds_extra} url = http://downloads.asterisk.org/pub/telephony/sounds/releases/ @@ -266,8 +268,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 22 %setup -q -n asterisk-%{V_asterisk} -D -T -a 23 + %setup -q -n asterisk-%{V_asterisk} -D -T -a 24 %endif ( cd addons %{l_tar} zxf %{_sourcedir}/mp3-%{V_asterisk_addons_mp3dec}.tar.gz @@ -306,6 +308,9 @@ -e 's;\(sh\) \(bash\) ksh sh5;\2 \1;' \ configure %{l_shtool} subst \ + -e 's/int foo2 = \(__sync_fetch_and_add(\&foo1, 1);\)/return \1/' \ + configure + %{l_shtool} subst \ -e 's;^\(#define DEFAULT_DB .*\${ASTDBDIR}\)/astdb;\1/asterisk.db;' \ build_tools/make_defaults_h %{l_shtool} subst \ @@ -331,7 +336,6 @@ -e 's;\(\)no\(\);\1yes\2;g' \ apps/app_ivrdemo.c \ apps/app_saycounted.c \ - apps/app_rpt.c \ utils/utils.xml \ agi/agi.xml %{l_shtool} subst \ @@ -598,7 +602,6 @@ %install # install program - rm -rf $RPM_BUILD_ROOT %{l_make} %{l_mflags} install \ DESTDIR=$RPM_BUILD_ROOT \ INSTALL_PREFIX=%{l_prefix} @@ -641,12 +644,20 @@ %endif ( echo 'Start of sound installation block (OpenPKG)' + # create main sound directory hierarchy + ( cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds + %{l_shtool} mkdir -f -p -m 755 en es fr en_AU + ) || exit $? %if "%{with_esounds}" == "yes" - # create sound directory hierarchy - for sndir in en es fr ru en_AU moh; do - %{l_shtool} mkdir -f -p -m 755 \ - $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/$sndir - done + # create extra sound directory hierarchy + %{l_shtool} mkdir -f -p -m 755 \ + $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/ru + $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/moh + + # install humorous 'new' prompts + cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/en + %{l_prefix}/bin/unzip %{_sourcedir}/new_prompts_%{V_asterisk_sounds_newpro}.zip + # install freeswitch sound prompt files, expecting # identical sound filenames to be overwritten later cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/en @@ -828,7 +839,6 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT %post %if "%{with_dahdi}" == "yes"