diff -r 08f5eb82b58f -r 9360a38b5c9f asterisk/asterisk.spec
--- a/asterisk/asterisk.spec	Fri Dec 02 16:12:09 2011 +0100
+++ b/asterisk/asterisk.spec	Fri Dec 02 19:22:01 2011 +0100
@@ -51,7 +51,7 @@
 Group:        VoIP
 License:      GPL
 Version:      %{V_opkg}
-Release:      20111100
+Release:      20111104
 
 #   package options
 %option       with_dahdi   no
@@ -66,6 +66,7 @@
 %option       with_srtp    no
 %option       with_pgsql   no
 %option       with_lua     no
+%option       with_gtalk   no
 %option       with_jabber  no
 %option       with_imap    no
 %option       with_odbc    no
@@ -163,6 +164,9 @@
 BuildPreReq:  radiusclient
 PreReq:       radiusclient
 %endif
+%if "%{with_gtalk}" == "yes"
+%define       with_jabber yes
+%endif
 %if "%{with_jabber}" == "yes"
 BuildPreReq:  iksemel
 PreReq:       iksemel
@@ -261,6 +265,11 @@
     }
 
 %prep
+%if "%{with_capi}" == "yes"
+    ( echo "Note that the system header files capi20.h, capicmd.h, and capiutils.h might"
+      echo "need adjusting in accordance withthe CAPI hardware vendor's kernel driver."
+    ) | %{l_rpmtool} msg -b -t warn
+%endif
     %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
@@ -286,6 +295,7 @@
     %{l_shtool} subst \
         -e 's;\(astdatadir=.*\)\${astvarlibdir};\1${datadir};' \
         -e 's;\(astvarlibdir=.*\)/lib/asterisk;\1/asterisk/lib;' \
+        -e 's;\(astdbdir=.*\)\${astvarlibdir};\1${localstatedir}/asterisk/db;' \
         -e 's;\(dir=.*{localstatedir}\)/\([^/][^/]*\)/asterisk;\1/asterisk/\2;g' \
         configure
     %{l_shtool} subst \
@@ -762,6 +772,12 @@
 %if "%{with_capi}" == "no"
         [ ".$name" = ".capi.conf" ] && continue
 %endif
+%if "%{with_gtalk}" == "no"
+        [ ".$name" = ".gtalk.conf" ] && continue
+%endif
+%if "%{with_jabber}" == "no"
+        [ ".$name" = ".jabber.conf" ] && continue
+%endif
 %if "%{with_sqlite}" == "no"
         [ ".$name" = ".cdr_sqlite3_custom.conf" ] && continue
 %endif