diff -r c403d9dd5e0e -r 10bd406e1c51 asterisk/asterisk.spec
--- a/asterisk/asterisk.spec	Sun May 29 17:14:31 2011 +0200
+++ b/asterisk/asterisk.spec	Sun Jun 05 11:43:33 2011 +0200
@@ -22,10 +22,11 @@
 ##
 
 #   package version
-%define       V_opkg                     1.8.3.2
-%define       V_asterisk                 1.8.3.2
-%define       V_asterisk_fax_digium      1.8.0_1.3.0
-%define       V_asterisk_sounds_core     1.4.20
+%define       V_opkg                     1.8.4.2
+%define       V_asterisk                 1.8.4.2
+%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
 %define       V_asterisk_sounds_extra    1.4.11
 %define       V_asterisk_sounds_amoogab  1.4
 %define       V_asterisk_sounds_amootts  current
@@ -49,7 +50,7 @@
 Group:        VoIP
 License:      GPL
 Version:      %{V_opkg}
-Release:      20110316
+Release:      20110602
 
 #   package options
 %option       with_dahdi   no
@@ -94,8 +95,8 @@
 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-1.8.0/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-1.8.0/x86-32/res_fax_digium-%{V_asterisk_fax_digium}-generic_32.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
@@ -107,7 +108,7 @@
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, bison, gcc, make, grep
+BuildPreReq:  OpenPKG, openpkg >= 20040130, bison, gcc, make, grep, pkgconfig
 PreReq:       OpenPKG, openpkg >= 20040130, MTA
 BuildPreReq:  zlib, curl, openssl, ncurses, speex, sox, popt, gmime, libxml
 PreReq:       zlib, curl, openssl, ncurses, speex, sox, popt, gmime, libxml
@@ -276,8 +277,6 @@
         -e 's;\(dir=.*{localstatedir}\)/\([^/][^/]*\)/asterisk;\1/asterisk/\2;g' \
         configure
     %{l_shtool} subst \
-        -e 's;-llua5\.1;-llua;' \
-        -e 's;lua5\.1/lua\.h;lua/lua.h;' \
         -e 's;ffmpeg/avcodec\.h;libavcodec/avcodec.h;' \
         -e 's;\(sqlite\)\(_exec\);\13\2;g' \
         -e 's;-lradiusclient-ng;-lradiusclient;g' \
@@ -657,6 +656,7 @@
       mv -f music/48000/* . && rm -rf music
 
       #   convert freeswitch 48000 and 441000 KHz to 8000 Khz
+      #   ffmpeg -i <in> -ar 8000 -ac 1 -acodec pcm_s16le -f s16le <out>
       cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk
       for highfile in `find . -name '*.wav'`; do
           lowfile=`echo $highfile | sed -e 's;\(.*\)\.wav;\1.sln16;'`
@@ -691,6 +691,7 @@
       #mv -f phonetic/de/* de/phonetic/ && rm -rf phonetic/de
       %{l_tar} jxf %{SOURCE astmultisnds-de-sln16-%{V_asterisk_sounds_custom}.tar.bz2}
       %{l_tar} jxf %{SOURCE msvbsnds-sln16-%{V_asterisk_sounds_custom}.tar.bz2}
+      mv msvbsnds-sln16-%{V_asterisk_sounds_custom} msvb
 
       #   install additional asterisk music on hold
       cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/moh
@@ -733,8 +734,8 @@
     #   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/lib/licenses \
-        $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/spool/outgoing
+        $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/spool/outgoing \
+        $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/licenses
 
     #   postadjust installation
     strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* \
@@ -784,7 +785,7 @@
     #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%config %{l_prefix}/var/asterisk/lib/licenses' \
+        '%config %attr(-,%{l_mgrp},%{l_mgrp}) %{l_prefix}/share/asterisk/licenses' \
         '%config %attr(640,%{l_mgrp},%{l_rgrp}) %{l_prefix}/etc/asterisk/*' \
         '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/asterisk'
 
@@ -836,7 +837,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/var/asterisk/lib"
+      echo "'licenses' which in turn must be found in $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."