# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1322850121 -3600
# Node ID 9360a38b5c9f8445df4095b70553c9c6f8166178
# Parent  08f5eb82b58fb4e901d36eee96d6f060e0fa8d9f
Correct DB path, add gtalk config and build logic, note CAPI header problem.

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
diff -r 08f5eb82b58f -r 9360a38b5c9f asterisk/asterisk.txt
--- a/asterisk/asterisk.txt	Fri Dec 02 16:12:09 2011 +0100
+++ b/asterisk/asterisk.txt	Fri Dec 02 19:22:01 2011 +0100
@@ -82,7 +82,7 @@
 
 ; You can open a TLS connection to this socket with:
 ;
-;	openssl s_client -connect my_host:5039
+;   openssl s_client -connect my_host:5039
 ;
 tlsenable          = no
 tlsbindaddr        = 127.0.0.1
@@ -238,7 +238,7 @@
 
 ;; This configuration is reread at reload
 ;; or with the CLI command
-;; 	reload chan_iax2.so
+;;   reload chan_iax2.so
 ;;
 ;; General settings, like port number to bind to, and
 ;; an option address (the default is to bind to all
@@ -251,7 +251,7 @@
 ;                    ; bindaddr if followed by colon and port
 ;                    ; (e.g. bindaddr=192.168.0.1:4569)
 ;bindaddr=127.0.0.1  ; more than once to bind to multiple
-;                    ; addresses, but the first will be the 
+;                    ; addresses, but the first will be the
 ;                    ; default
 
 </file>
@@ -710,6 +710,35 @@
 ;context           = parkedcalls
 
 </file>
+<file name="gtalk.conf">
+;;
+;;  gtalk.conf -- Asterisk GTalk configuration
+;;
+
+[general]
+;context     = default     ; Context to dump call into
+;bindaddr    = 0.0.0.0     ; Address to bind to
+;externip    = 127.0.0.1   ; Set your external ip if you are behind a NAT.
+;stunaddr    = <hostname>  ; Get your external ip from a STUN server.
+;                          ; Note, if the STUN query is successful, this
+;                          ; will replace any value placed in externip;
+;allowguest  = yes         ; Allow calls from people not in list of peers
+
+[guest]                   ; special account for options on guest account
+;disallow    = all
+;allow       = ulaw
+;context     = guest
+
+[ogorman]
+;username    = <person>@gmail.com  ; username of the peer you're
+;                                  ; calling or accepting calls from
+;disallow    = all
+;allow       = ulaw
+;context     = default
+;connection  = asterisk            ; client or component in jabber.conf
+;                                  ; for the call to leave on.
+
+</file>
 <file name="jabber.conf">
 ;;
 ;;  jabber.conf -- Asterisk Jabber configuration