diff -r ded2db56a196 -r 4ef5d37e8bb2 asterisk/asterisk.spec
--- a/asterisk/asterisk.spec	Mon Sep 01 21:55:47 2014 +0200
+++ b/asterisk/asterisk.spec	Mon Sep 01 21:57:20 2014 +0200
@@ -22,19 +22,19 @@
 ##
 
 #   package version
-%define       V_opkg                     1.8.20.2
-%define       V_asterisk                 1.8.20.2
+%define       V_opkg                     1.8.30.0
+%define       V_asterisk                 1.8.30.0
 %define       V_asterisk_fax_subdir      1.8.4
 %define       V_asterisk_fax_digium      1.8.4_1.3.1
-%define       V_asterisk_sounds_core     1.4.23
-%define       V_asterisk_sounds_extra    1.4.13
+%define       V_asterisk_sounds_core     1.4.25
+%define       V_asterisk_sounds_extra    1.4.14
 %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.24
+%define       V_fswitch_sounds_en        1.0.25
 %define       V_fswitch_sounds_fr        1.0.18
 %define       V_fswitch_sounds_ru        1.0.13
 %define       V_fswitch_music            1.0.8
@@ -52,14 +52,15 @@
 Group:        VoIP
 License:      GPL
 Version:      %{V_opkg}
-Release:      20120800
+Release:      20140800
 
 #   package options
 %option       with_dahdi   no
 %option       with_capi    no
 %option       with_ogg     no
 %option       with_mp3     no
-%option       with_fax     no
+%option       with_faxmod  no
+%option       with_faxarch generic
 %option       with_avcodec no
 %option       with_ldap    no
 %option       with_radius  no
@@ -123,6 +124,8 @@
 Patch2:       asterisk.patch.proxymwi
 
 #   build information
+Prefix:       %{l_prefix}
+BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20100101, bison, gcc, make, grep, pkgconfig
 PreReq:       OpenPKG, openpkg >= 20100101, MTA
 BuildPreReq:  zlib, curl, openssl, ncurses, speex, sox, popt, gmime, libxml
@@ -184,6 +187,8 @@
 %if "%{with_esounds}" == "yes"
 BuildPreReq:  sox, infozip
 %endif
+AutoReq:      no
+AutoReqProv:  no
 
 %description
     Asterisk is a complete Private Branch Exchange (PBX) in software.
@@ -278,7 +283,7 @@
     %setup -q -n asterisk-%{V_asterisk}
     %setup -q -n asterisk-%{V_asterisk} -D -T -a 1
     %setup -q -n asterisk-%{V_asterisk} -D -T -a 2
-%if "%{with_fax}" == "yes"
+%if "%{with_faxmod}" == "yes"
     %setup -q -n asterisk-%{V_asterisk} -D -T -a 23
     %setup -q -n asterisk-%{V_asterisk} -D -T -a 24
 %endif
@@ -311,7 +316,8 @@
         -e 's;lua5\.1;lua;g' \
         -e 's;-I${IMAP_TK_DIR}/c-client;-DUSE_SYSTEM_IMAP -I${IMAP_TK_DIR}/include/imap;g' \
         -e 's;${IMAP_TK_DIR}/c-client/c-client\.a;-limap -lssl -lcrypto -lcrypt;g' \
-        -e 's;LIBXML2_INCLUDE="-I\${LIBXML2_DIR}/include";echo "Removing really buggy hard coded LibXML include defs.";' \
+        -e 's;LIBXML2_INCLUDE=\$(echo \${LIBXML2_INCLUDE} | \$SED -e "s|-I|-I\${LIBXML2_DIR}|g");echo "Removing really buggy hard coded LibXML include defs.";' \
+        -e 's;LIBXML2_LIB=\$(echo \${LIBXML2_LIB} | \$SED -e "s|-L|-L\${LIBXML2_DIR}|g");echo "Removing really buggy hard coded LibXML linkage defs.";' \
         -e 's;\(for ver in 2\.0 2\.2 2\.4\);\1 2.6;' \
         -e 's;\(\-lpq.*\-lz.*\)";\1 ${PTHREAD_LIBS}";g'\
         configure
@@ -397,6 +403,13 @@
     %{l_shtool} subst \
         -e 's;#ifdef CC_AST_HAS_VERSION_1_6$;#if (defined(CC_AST_HAS_VERSION_1_6) \&\& !defined(CC_AST_HAS_VERSION_1_8));g' \
         chan_capi-%{V_chan_capi}/chan_capi_devstate.c
+    %{l_shtool} subst \
+        -e "s;^\(NCURSES_INCLUDE=\).*;\1%{l_cppflags ncurses};" \
+        -e "s;^\(NCURSES_LIB=\);\1%{l_ldflags} ;" \
+        menuselect/makeopts.in
+    %{l_shtool} subst \
+        -e 's; *\.lastclean;;g' \
+        Makefile
     case "%{l_platform -t}" in
         *-sunos* )
             %{l_shtool} subst \
@@ -619,6 +632,9 @@
 %endif
 
 %install
+    #   remove build cruft
+    rm -rf $RPM_BUILD_ROOT
+
     #   install program
     %{l_make} %{l_mflags} install \
         DESTDIR=$RPM_BUILD_ROOT \
@@ -634,7 +650,7 @@
     ) || exit $?
 %endif
 
-%if "%{with_fax}" == "yes"
+%if "%{with_faxmod}" == "yes"
     #   install fax support
     case "%{l_platform -t}" in
         amd64*-* )
@@ -713,7 +729,7 @@
       cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk
       for highfile in `find . -name '*.wav'`; do
           lowfile=`echo $highfile | sed -e 's;\(.*\)\.wav;\1.sln16;'`
-          %{l_prefix}/bin/sox $highfile -t raw -r 16000 -s -2 -c 1 $lowfile
+          %{l_prefix}/bin/sox $highfile -t raw -r 16000 -e signed-integer -b 16 -c 1 $lowfile
           rm $highfile
       done
 %endif
@@ -857,6 +873,7 @@
 %files -f files
 
 %clean
+    rm -rf $RPM_BUILD_ROOT
 
 %post
 %if "%{with_dahdi}" == "yes"
@@ -893,7 +910,7 @@
         ) || exit $?
     fi
 %endif
-%if "%{with_fax}" == "yes"
+%if "%{with_faxmod}" == "yes"
     ( 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"