1.1 --- a/asterisk/asterisk.spec Fri Dec 02 16:12:09 2011 +0100 1.2 +++ b/asterisk/asterisk.spec Fri Dec 02 19:22:01 2011 +0100 1.3 @@ -51,7 +51,7 @@ 1.4 Group: VoIP 1.5 License: GPL 1.6 Version: %{V_opkg} 1.7 -Release: 20111100 1.8 +Release: 20111104 1.9 1.10 # package options 1.11 %option with_dahdi no 1.12 @@ -66,6 +66,7 @@ 1.13 %option with_srtp no 1.14 %option with_pgsql no 1.15 %option with_lua no 1.16 +%option with_gtalk no 1.17 %option with_jabber no 1.18 %option with_imap no 1.19 %option with_odbc no 1.20 @@ -163,6 +164,9 @@ 1.21 BuildPreReq: radiusclient 1.22 PreReq: radiusclient 1.23 %endif 1.24 +%if "%{with_gtalk}" == "yes" 1.25 +%define with_jabber yes 1.26 +%endif 1.27 %if "%{with_jabber}" == "yes" 1.28 BuildPreReq: iksemel 1.29 PreReq: iksemel 1.30 @@ -261,6 +265,11 @@ 1.31 } 1.32 1.33 %prep 1.34 +%if "%{with_capi}" == "yes" 1.35 + ( echo "Note that the system header files capi20.h, capicmd.h, and capiutils.h might" 1.36 + echo "need adjusting in accordance withthe CAPI hardware vendor's kernel driver." 1.37 + ) | %{l_rpmtool} msg -b -t warn 1.38 +%endif 1.39 %setup -q -n asterisk-%{V_asterisk} 1.40 %setup -q -n asterisk-%{V_asterisk} -D -T -a 1 1.41 %setup -q -n asterisk-%{V_asterisk} -D -T -a 2 1.42 @@ -286,6 +295,7 @@ 1.43 %{l_shtool} subst \ 1.44 -e 's;\(astdatadir=.*\)\${astvarlibdir};\1${datadir};' \ 1.45 -e 's;\(astvarlibdir=.*\)/lib/asterisk;\1/asterisk/lib;' \ 1.46 + -e 's;\(astdbdir=.*\)\${astvarlibdir};\1${localstatedir}/asterisk/db;' \ 1.47 -e 's;\(dir=.*{localstatedir}\)/\([^/][^/]*\)/asterisk;\1/asterisk/\2;g' \ 1.48 configure 1.49 %{l_shtool} subst \ 1.50 @@ -762,6 +772,12 @@ 1.51 %if "%{with_capi}" == "no" 1.52 [ ".$name" = ".capi.conf" ] && continue 1.53 %endif 1.54 +%if "%{with_gtalk}" == "no" 1.55 + [ ".$name" = ".gtalk.conf" ] && continue 1.56 +%endif 1.57 +%if "%{with_jabber}" == "no" 1.58 + [ ".$name" = ".jabber.conf" ] && continue 1.59 +%endif 1.60 %if "%{with_sqlite}" == "no" 1.61 [ ".$name" = ".cdr_sqlite3_custom.conf" ] && continue 1.62 %endif