1.1 --- a/asterisk/asterisk.spec Tue Aug 28 18:32:00 2012 +0200
1.2 +++ b/asterisk/asterisk.spec Tue Aug 28 18:32:05 2012 +0200
1.3 @@ -22,23 +22,24 @@
1.4 ##
1.5
1.6 # package version
1.7 -%define V_opkg 1.8.11.0
1.8 -%define V_asterisk 1.8.11.0
1.9 +%define V_opkg 1.8.15.0
1.10 +%define V_asterisk 1.8.15.0
1.11 %define V_asterisk_fax_subdir 1.8.4
1.12 -%define V_asterisk_fax_digium 1.8.4_1.3.0
1.13 +%define V_asterisk_fax_digium 1.8.4_1.3.1
1.14 %define V_asterisk_sounds_core 1.4.22
1.15 %define V_asterisk_sounds_extra 1.4.11
1.16 %define V_asterisk_sounds_amoogab 1.4
1.17 %define V_asterisk_sounds_amootts current
1.18 %define V_asterisk_sounds_custom 1.0
1.19 %define V_asterisk_sounds_mohop 2.03
1.20 +%define V_asterisk_sounds_newpro july_2012
1.21 %define V_asterisk_addons_mp3dec 1
1.22 -%define V_fswitch_sounds_en 1.0.16
1.23 -%define V_fswitch_sounds_fr 1.0.14
1.24 +%define V_fswitch_sounds_en 1.0.20
1.25 +%define V_fswitch_sounds_fr 1.0.16
1.26 %define V_fswitch_sounds_ru 1.0.13
1.27 %define V_fswitch_music 1.0.8
1.28 %define V_asterisk_codecs_ilbc 20110104
1.29 -%define V_chan_capi 1.1.5.20120324
1.30 +%define V_chan_capi 1.1.5.20120615
1.31
1.32 # package information
1.33 Name: asterisk
1.34 @@ -51,7 +52,7 @@
1.35 Group: VoIP
1.36 License: GPL
1.37 Version: %{V_opkg}
1.38 -Release: 20120330
1.39 +Release: 20120800
1.40
1.41 # package options
1.42 %option with_dahdi no
1.43 @@ -80,7 +81,6 @@
1.44 Source0: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{V_asterisk}.tar.gz
1.45 Source1: ftp://ftp.chan-capi.org/chan-capi/chan_capi-%{V_chan_capi}.tar.gz
1.46 Source2: ftp://ftp.europalab.com/pub/sfw/machsnds/asterisk-moh-freeplay-sln16.tar.gz
1.47 -
1.48 Source3: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-sln16-%{V_asterisk_sounds_mohop}.tar.gz
1.49 Source4: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-%{V_asterisk_sounds_core}.tar.gz
1.50 Source5: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-%{V_asterisk_sounds_core}.tar.gz
1.51 @@ -89,32 +89,31 @@
1.52 Source8: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-sln16-%{V_asterisk_sounds_core}.tar.gz
1.53 Source9: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-sln16-%{V_asterisk_sounds_extra}.tar.gz
1.54 Source10: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-sln16-%{V_asterisk_sounds_extra}.tar.gz
1.55 -Source11: http://www.amooma.de/asterisk/sprachbausteine/asterisk-%{V_asterisk_sounds_amoogab}-de-prompts.tar.gz
1.56 -Source12: http://www.amooma.de/asterisk/sprachbausteine/asterisk-core-sounds-de-gsm-current.tar.gz
1.57 -Source13: ftp://ftp.europalab.com/pub/sfw/machsnds/de-digits/de-digits-%{V_asterisk_sounds_custom}.tar.bz2
1.58 -Source14: ftp://ftp.europalab.com/pub/sfw/machsnds/de-sounds/astmultisnds-de-sln16-%{V_asterisk_sounds_custom}.tar.bz2
1.59 -Source15: ftp://ftp.europalab.com/pub/sfw/machsnds/msvbsnds-sln16-%{V_asterisk_sounds_custom}.tar.bz2
1.60 -Source16: http://files.freeswitch.org/freeswitch-sounds-en-us-callie-48000-%{V_fswitch_sounds_en}.tar.gz
1.61 -Source17: http://files.freeswitch.org/freeswitch-sounds-es-mx-maria-44100.tar.gz
1.62 -Source18: http://files.freeswitch.org/freeswitch-sounds-fr-ca-june-48000-%{V_fswitch_sounds_fr}.tar.gz
1.63 -Source19: http://files.freeswitch.org/freeswitch-sounds-ru-RU-elena-48000-%{V_fswitch_sounds_ru}.tar.gz
1.64 -Source20: http://files.freeswitch.org/freeswitch-sounds-music-48000-%{V_fswitch_music}.tar.gz
1.65 -Source21: http://svn.digium.com/svn/thirdparty/mp3/trunk/addons/mp3-%{V_asterisk_addons_mp3dec}.tar.gz
1.66 -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
1.67 -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
1.68 -Source24: ilbc-20110104.tar.gz
1.69 -Source25: asterisk.txt
1.70 -Source26: rc.asterisk
1.71 -Source27: wakeup.agi
1.72 +Source11: http://www.asterisk.org/files/new_prompts_%{V_asterisk_sounds_newpro}.zip
1.73 +Source12: http://www.amooma.de/asterisk/sprachbausteine/asterisk-%{V_asterisk_sounds_amoogab}-de-prompts.tar.gz
1.74 +Source13: http://www.amooma.de/asterisk/sprachbausteine/asterisk-core-sounds-de-gsm-current.tar.gz
1.75 +Source14: ftp://ftp.europalab.com/pub/sfw/machsnds/de-digits/de-digits-%{V_asterisk_sounds_custom}.tar.bz2
1.76 +Source15: ftp://ftp.europalab.com/pub/sfw/machsnds/de-sounds/astmultisnds-de-sln16-%{V_asterisk_sounds_custom}.tar.bz2
1.77 +Source16: ftp://ftp.europalab.com/pub/sfw/machsnds/msvbsnds-sln16-%{V_asterisk_sounds_custom}.tar.bz2
1.78 +Source17: http://files.freeswitch.org/freeswitch-sounds-en-us-callie-48000-%{V_fswitch_sounds_en}.tar.gz
1.79 +Source18: http://files.freeswitch.org/freeswitch-sounds-es-mx-maria-44100.tar.gz
1.80 +Source19: http://files.freeswitch.org/freeswitch-sounds-fr-ca-june-48000-%{V_fswitch_sounds_fr}.tar.gz
1.81 +Source20: http://files.freeswitch.org/freeswitch-sounds-ru-RU-elena-48000-%{V_fswitch_sounds_ru}.tar.gz
1.82 +Source21: http://files.freeswitch.org/freeswitch-sounds-music-48000-%{V_fswitch_music}.tar.gz
1.83 +Source22: http://svn.digium.com/svn/thirdparty/mp3/trunk/addons/mp3-%{V_asterisk_addons_mp3dec}.tar.gz
1.84 +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
1.85 +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
1.86 +Source25: ilbc-%{V_asterisk_codecs_ilbc}.tar.gz
1.87 +Source26: asterisk.txt
1.88 +Source27: rc.asterisk
1.89 +Source28: wakeup.agi
1.90 Patch0: asterisk.patch
1.91 Patch1: asterisk.patch.xfersips
1.92 Patch2: asterisk.patch.proxymwi
1.93
1.94 # build information
1.95 -Prefix: %{l_prefix}
1.96 -BuildRoot: %{l_buildroot}
1.97 -BuildPreReq: OpenPKG, openpkg >= 20060823, bison, gcc, make, grep, pkgconfig
1.98 -PreReq: OpenPKG, openpkg >= 20060823, MTA
1.99 +BuildPreReq: OpenPKG, openpkg >= 20100101, bison, gcc, make, grep, pkgconfig
1.100 +PreReq: OpenPKG, openpkg >= 20100101, MTA
1.101 BuildPreReq: zlib, curl, openssl, ncurses, speex, sox, popt, gmime, libxml
1.102 PreReq: zlib, curl, openssl, ncurses, speex, sox, popt, gmime, libxml
1.103 %if "%{with_ogg}" == "yes"
1.104 @@ -172,10 +171,8 @@
1.105 PreReq: libpri > 1.4.11.5
1.106 %endif
1.107 %if "%{with_esounds}" == "yes"
1.108 -BuildPreReq: sox
1.109 +BuildPreReq: sox, infozip
1.110 %endif
1.111 -AutoReq: no
1.112 -AutoReqProv: no
1.113
1.114 %description
1.115 Asterisk is a complete Private Branch Exchange (PBX) in software.
1.116 @@ -220,6 +217,11 @@
1.117 url = http://downloads.asterisk.org/pub/telephony/sounds/releases/
1.118 regex = asterisk-core-sounds-en-sln16-(\d+\.\d+(\.\d+)+)\.tar\.gz
1.119 }
1.120 + prog asterisk:sounds_newpro = {
1.121 + version = %{V_asterisk_sounds_newpro}
1.122 + url = http://www.asterisk.org/files/
1.123 + regex = new_prompts_(__VER__)\.zip
1.124 + }
1.125 prog asterisk:sounds_extra = {
1.126 version = %{V_asterisk_sounds_extra}
1.127 url = http://downloads.asterisk.org/pub/telephony/sounds/releases/
1.128 @@ -266,8 +268,8 @@
1.129 %setup -q -n asterisk-%{V_asterisk} -D -T -a 1
1.130 %setup -q -n asterisk-%{V_asterisk} -D -T -a 2
1.131 %if "%{with_fax}" == "yes"
1.132 - %setup -q -n asterisk-%{V_asterisk} -D -T -a 22
1.133 %setup -q -n asterisk-%{V_asterisk} -D -T -a 23
1.134 + %setup -q -n asterisk-%{V_asterisk} -D -T -a 24
1.135 %endif
1.136 ( cd addons
1.137 %{l_tar} zxf %{_sourcedir}/mp3-%{V_asterisk_addons_mp3dec}.tar.gz
1.138 @@ -306,6 +308,9 @@
1.139 -e 's;\(sh\) \(bash\) ksh sh5;\2 \1;' \
1.140 configure
1.141 %{l_shtool} subst \
1.142 + -e 's/int foo2 = \(__sync_fetch_and_add(\&foo1, 1);\)/return \1/' \
1.143 + configure
1.144 + %{l_shtool} subst \
1.145 -e 's;^\(#define DEFAULT_DB .*\${ASTDBDIR}\)/astdb;\1/asterisk.db;' \
1.146 build_tools/make_defaults_h
1.147 %{l_shtool} subst \
1.148 @@ -331,7 +336,6 @@
1.149 -e 's;\(<defaultenabled>\)no\(</defaultenabled>\);\1yes\2;g' \
1.150 apps/app_ivrdemo.c \
1.151 apps/app_saycounted.c \
1.152 - apps/app_rpt.c \
1.153 utils/utils.xml \
1.154 agi/agi.xml
1.155 %{l_shtool} subst \
1.156 @@ -598,7 +602,6 @@
1.157
1.158 %install
1.159 # install program
1.160 - rm -rf $RPM_BUILD_ROOT
1.161 %{l_make} %{l_mflags} install \
1.162 DESTDIR=$RPM_BUILD_ROOT \
1.163 INSTALL_PREFIX=%{l_prefix}
1.164 @@ -641,12 +644,20 @@
1.165 %endif
1.166
1.167 ( echo 'Start of sound installation block (OpenPKG)'
1.168 + # create main sound directory hierarchy
1.169 + ( cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds
1.170 + %{l_shtool} mkdir -f -p -m 755 en es fr en_AU
1.171 + ) || exit $?
1.172 %if "%{with_esounds}" == "yes"
1.173 - # create sound directory hierarchy
1.174 - for sndir in en es fr ru en_AU moh; do
1.175 - %{l_shtool} mkdir -f -p -m 755 \
1.176 - $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/$sndir
1.177 - done
1.178 + # create extra sound directory hierarchy
1.179 + %{l_shtool} mkdir -f -p -m 755 \
1.180 + $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/ru
1.181 + $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/moh
1.182 +
1.183 + # install humorous 'new' prompts
1.184 + cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/en
1.185 + %{l_prefix}/bin/unzip %{_sourcedir}/new_prompts_%{V_asterisk_sounds_newpro}.zip
1.186 +
1.187 # install freeswitch sound prompt files, expecting
1.188 # identical sound filenames to be overwritten later
1.189 cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/en
1.190 @@ -828,7 +839,6 @@
1.191 %files -f files
1.192
1.193 %clean
1.194 - rm -rf $RPM_BUILD_ROOT
1.195
1.196 %post
1.197 %if "%{with_dahdi}" == "yes"
