Sun Jan 4 18:58:41 UTC 2009

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30639

Modified Files:
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0003-Allow-alternate-extensions-to-be-specified-in-users.patch 
	0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch 
	0005-Add-chan_mobile-from-asterisk-addons.patch 
	0006-Use-pkgconfig-to-check-for-Lua.patch 
	0007-Build-using-external-libedit.patch 
	0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
	0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 
	0011-Merged-revisions-160170-160172-via-svnmerge-from.patch 
	0012-Merged-revisions-162275-via-svnmerge-from.patch 
	0013-Update-autoconf.patch asterisk.spec 
Added Files:
	0014-Fix-up-some-paths.patch 
Log Message:
* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-3
- Don't package func_curl in the main package. BZ#475910
- Fix up paths. BZ#477238


0014-Fix-up-some-paths.patch:

--- NEW FILE 0014-Fix-up-some-paths.patch ---
>From 57e9e58cb5d501da652d227eb8c07b2593d333ff Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sun, 4 Jan 2009 12:51:05 -0600
Subject: [PATCH 14/14] Fix up some paths.

---
 UPGRADE-1.4.txt                             |    2 +-
 configs/festival.conf.sample                |    2 +-
 configs/http.conf.sample                    |    6 ++--
 configs/iax.conf.sample                     |    4 +-
 configs/musiconhold.conf.sample             |   10 ++++----
 configs/osp.conf.sample                     |    4 +-
 configs/phoneprov.conf.sample               |    2 +-
 contrib/scripts/astgenkey                   |    2 +-
 contrib/scripts/astgenkey.8                 |    6 ++--
 doc/osp.txt                                 |    8 +++---
 doc/tex/phoneprov.tex                       |    2 +-
 doc/tex/privacy.tex                         |    6 ++--
 pbx/ael/ael-test/ael-test3/extensions.ael   |   28 +++++++++++++-------------
 pbx/ael/ael-test/ael-vtest13/extensions.ael |   28 +++++++++++++-------------
 pbx/ael/ael-test/ref.ael-vtest13            |   26 ++++++++++++------------
 15 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/UPGRADE-1.4.txt b/UPGRADE-1.4.txt
index 4f82694..69bf322 100644
--- a/UPGRADE-1.4.txt
+++ b/UPGRADE-1.4.txt
@@ -92,7 +92,7 @@ sound packages in the 'sounds' subdirectory to be used later during installation
 WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
 instead of the alternate-language files being stored in subdirectories underneath
 the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
-etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
+etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the
 language itself, then places all the sound files for that language under that
 directory and its subdirectories. This is the layout that will be created if you
 select non-English languages to be installed via menuselect, HOWEVER Asterisk does
diff --git a/configs/festival.conf.sample b/configs/festival.conf.sample
index 774f1a1..815f11d 100644
--- a/configs/festival.conf.sample
+++ b/configs/festival.conf.sample
@@ -21,7 +21,7 @@
 ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
 ; Defaults to /tmp/
 ;
-;cachedir=/var/lib/asterisk/festivalcache/
+;cachedir=/var/spool/asterisk/festival/
 ;
 ; Festival command to send to the server.
 ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
diff --git a/configs/http.conf.sample b/configs/http.conf.sample
index f15c9cf..6349905 100644
--- a/configs/http.conf.sample
+++ b/configs/http.conf.sample
@@ -5,7 +5,7 @@
 ; Note about Asterisk documentation:
 ;   If Asterisk was installed from a tarball, then the HTML documentation should
 ;   be installed in the static-http/docs directory which is
-;   (/var/lib/asterisk/static-http/docs) on linux by default.  If the Asterisk
+;   (/usr/share/asterisk/static-http/docs) on linux by default.  If the Asterisk
 ;   HTTP server is enabled in this file by setting the "enabled", "bindaddr",
 ;   and "bindport" options, then you should be able to view the documentation
 ;   remotely by browsing to:
@@ -66,6 +66,6 @@ bindaddr=127.0.0.1
 ;[post_mappings]
 ;
 ; In this example, if the prefix option is set to "asterisk", then using the
-; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/.
-;uploads = /var/lib/asterisk/uploads/
+; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
+;uploads = /var/spool/asterisk/uploads/
 ;
diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index 854a243..ab2938e 100644
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -348,8 +348,8 @@ inkeys=freeworlddialup
 ; authentication is used, "inkeys" is a list of acceptable public keys on the 
 ; local system that can be used to authenticate the remote peer, separated by
 ; the ":" character.  "outkey" is a single, private key to use to authenticate
-; to the other side.  Public keys are named /var/lib/asterisk/keys/<name>.pub
-; while private keys are named /var/lib/asterisk/keys/<name>.key.  Private
+; to the other side.  Public keys are named /usr/share/asterisk/keys/<name>.pub
+; while private keys are named /usr/share/asterisk/keys/<name>.key.  Private
 ; keys should always be 3DES encrypted.
 ;
 ;
diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample
index 4df1afd..b730335 100644
--- a/configs/musiconhold.conf.sample
+++ b/configs/musiconhold.conf.sample
@@ -39,11 +39,11 @@
 
 [default]
 mode=files
-directory=/var/lib/asterisk/moh
+directory=/usr/share/asterisk/moh
 ;
 ;[native-random]
 ;mode=files
-;directory=/var/lib/asterisk/moh
+;directory=/usr/share/asterisk/moh
 ;digit=#        ; If this option is set for a class, then when callers are
 ;               ; listening to music on hold, they can press this digit, and
 ;               ; they will switch to listening to this music class.
@@ -51,7 +51,7 @@ directory=/var/lib/asterisk/moh
 
 ;[native-alphabetical]
 ;mode=files
-;directory=/var/lib/asterisk/moh
+;directory=/usr/share/asterisk/moh
 ;sort=alpha     ; Sort the files in alphabetical order.  If this option is
 ;               ; not specified, the sort order is undefined.
 
@@ -63,7 +63,7 @@ directory=/var/lib/asterisk/moh
 ;mode=custom
 ; Note that with mode=custom, a directory is not required, such as when reading
 ; from a stream.
-;directory=/var/lib/asterisk/mohmp3
+;directory=/usr/share/asterisk/mohmp3
 ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
 
 ;[ulawstream]
@@ -75,5 +75,5 @@ directory=/var/lib/asterisk/moh
 ; choice
 ;[solaris]
 ;mode=custom
-;directory=/var/lib/asterisk/mohmp3
+;directory=/usr/share/asterisk/mohmp3
 ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
diff --git a/configs/osp.conf.sample b/configs/osp.conf.sample
index e342337..2e346e6 100644
--- a/configs/osp.conf.sample
+++ b/configs/osp.conf.sample
@@ -36,8 +36,8 @@
 ;source=domain name or [IP address in brackets]
 ;
 ; Define path and file name of crypto files.
-; The default path for crypto file is /var/lib/asterisk/keys.  If no path is 
-; defined, crypto files will in /var/lib/asterisk/keys directory.
+; The default path for crypto file is /usr/share/asterisk/keys.  If no path is 
+; defined, crypto files will in /usr/share/asterisk/keys directory.
 ;
 ; Specify the private key file name.  
 ; If this parameter is unspecified or not present, the default name will be the 
diff --git a/configs/phoneprov.conf.sample b/configs/phoneprov.conf.sample
index 8f55fa8..2608914 100644
--- a/configs/phoneprov.conf.sample
+++ b/configs/phoneprov.conf.sample
@@ -57,4 +57,4 @@ ${TOLOWER(${MAC})}.cfg => 000000000000.cfg               ; Dynamically generated
 ${TOLOWER(${MAC})}-phone.cfg => 000000000000-phone.cfg   ; (relative to AST_DATA_DIR/phoneprov)
 config/${TOLOWER(${MAC})} => polycom.xml                 ; Dynamic Filename => template file 
 ${TOLOWER(${MAC})}-directory.xml => 000000000000-directory.xml
-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
diff --git a/contrib/scripts/astgenkey b/contrib/scripts/astgenkey
index 6376048..e4a5a80 100644
--- a/contrib/scripts/astgenkey
+++ b/contrib/scripts/astgenkey
@@ -29,7 +29,7 @@ if [ "$QUIET" != 'y' ]; then
 	echo "in PEM format for use by Asterisk.  You will be asked to"
 	echo "enter a passcode for your key multiple times.  Please"
 	echo "enter the same code each time.  The resulting files will"
-	echo "need to be moved to /var/lib/asterisk/keys if you want"
+	echo "need to be moved to /usr/share/asterisk/keys if you want"
 	echo "to use them, and any private keys (.key files) will"
 	echo "need to be initialized at runtime either by running"
 	echo "Asterisk with the '-i' option, or with the 'init keys'"
diff --git a/contrib/scripts/astgenkey.8 b/contrib/scripts/astgenkey.8
index 328a4d2..ac6feae 100644
--- a/contrib/scripts/astgenkey.8
+++ b/contrib/scripts/astgenkey.8
@@ -88,7 +88,7 @@ The private key: secret.
 .RE
 
 Those files should be copied to 
-.I /var/lib/asterisk/keys
+.I /usr/share/asterisk/keys
 
 (The private key: on your system. The public key: on other systems)
 
@@ -122,10 +122,10 @@ readable, such as with the following commands:
 And then make the key accessible to Asterisk (assuming you run it as
 user "asterisk").
 
-  chown asterisk /var/lib/asterisk/keys/yourname.*
+  chown asterisk /usr/share/asterisk/keys/yourname.*
 
 .SH FILES
-.I /var/lib/asterisk/keys
+.I /usr/share/asterisk/keys
 .RS
 .RE
 
diff --git a/doc/osp.txt b/doc/osp.txt
index a0cd429..932f214 100644
--- a/doc/osp.txt
+++ b/doc/osp.txt
@@ -136,7 +136,7 @@ make clean; make linux
 Compilation is successful if there are no errors in the compiler output. The enroll program is now located in the OSP Toolkit/bin directory (example: /usr/src/ TK-3_3_6-20060303/bin). 
 
 2.2 Obtain Crypto Files
-The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /var/lib/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /var/lib/asterisk/keys directory.  
+The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /usr/share/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /usr/share/asterisk/keys directory.  
 
 Note: The osptestserver.transnexus.com is configured only for sending and receiving non-SSL messages, and issuing signed tokens. If you need help, post a message on the OSP mailing list at https://lists.sourceforge.net/lists/listinfo/osp-toolkit-client..
 
@@ -183,7 +183,7 @@ depth=0 /CN=osptestserver.transnexus.com/O=OSPServer
 verify return:1
 The certificate request was successful.
 Error Code returned from localcert command : 0
-The files generated should be copied to the /var/lib/asterisk/keys directory. 
+The files generated should be copied to the /usr/share/asterisk/keys directory. 
 Note: The script enroll.sh requires AT&T korn shell (ksh) or any of its compatible variants. The /usr/src/TK-3_3_6-20060303/bin directory should be in the PATH variable. Otherwise, enroll.sh cannot find the enroll file.
 
 3 Asterisk
@@ -247,9 +247,9 @@ servicepoint=http://OSP server IP:1080/osp
 source=[host IP]
 ;
 ; Define path and file name of crypto files.
-; The default path for crypto file is /var/lib/asterisk/keys.  If no
+; The default path for crypto file is /usr/share/asterisk/keys.  If no
 ; path is defined, crypto files should be in  
-; /var/lib/asterisk/keys directory.
+; /usr/share/asterisk/keys directory.
 ;
 ; Specify the private key file name.  
 ; If this parameter is unspecified or not present, the default name 
diff --git a/doc/tex/phoneprov.tex b/doc/tex/phoneprov.tex
index cb236a8..be01d34 100644
--- a/doc/tex/phoneprov.tex
+++ b/doc/tex/phoneprov.tex
@@ -58,7 +58,7 @@ files, respectively. A sample profile:
 [polycom]
 staticdir => configs/
 mime_type => text/xml
-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg
+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg
 static_file => bootrom.ld,application/octet-stream
 static_file => bootrom.ver,plain/text
 static_file => sip.ld,application/octet-stream
diff --git a/doc/tex/privacy.tex b/doc/tex/privacy.tex
index 81b2fac..9971641 100644
--- a/doc/tex/privacy.tex
+++ b/doc/tex/privacy.tex
@@ -204,7 +204,7 @@ helpful.
 
 When there is no CallerID, P and p options will always record an intro
 for the incoming caller. This intro will be stored temporarily in the
-\path{/var/lib/asterisk/sounds/priv-callerintros} dir, under the name
+\path{/usr/share/asterisk/sounds/priv-callerintros} dir, under the name
 NOCALLERID\_$<$extension$>$ $<$channelname$>$ and will be erased after the
 callee decides what to do with the call.
 
@@ -239,7 +239,7 @@ introductions are stored and re-used for the convenience of the CALLER.
 \subsubsection{Introductions}
 Unless instructed to not save introductions (see the 'n' option above),
 the screening modes will save the recordings of the caller's names in
-the directory \path{/var/lib/asterisk/sounds/priv-callerintros}, if they have
+the directory \path{/usr/share/asterisk/sounds/priv-callerintros}, if they have
 a CallerID.  Just the 10-digit callerid numbers are used as filenames,
 with a ".gsm" at the end.
 
@@ -254,7 +254,7 @@ loudspeakers, and perhaps other nifty things. For instance:
 
 \begin{astlisting}
 \begin{verbatim}
-exten => s,6,Set(PATH=/var/lib/asterisk/sounds/priv-callerintros)
+exten => s,6,Set(PATH=/usr/share/asterisk/sounds/priv-callerintros)
 exten => s,7,System(/usr/bin/play ${PATH}/${CALLERID(num)}.gsm&,0)
 \end{verbatim}
 \end{astlisting}
diff --git a/pbx/ael/ael-test/ael-test3/extensions.ael b/pbx/ael/ael-test/ael-test3/extensions.ael
index ff1f6ae..53fb918 100755
--- a/pbx/ael/ael-test/ael-test3/extensions.ael
+++ b/pbx/ael/ael-test/ael-test3/extensions.ael
@@ -2049,7 +2049,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
 
 macro callerid-liar()
 {
-	TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
+	TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
 	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their 
                             //         faces to get in the front door, and unidentified callers won't fair
                             //         any better. You entered *MY* phone number. That won't work.
@@ -2106,7 +2106,7 @@ context homeline {
 		PrivacyManager();
 		if( "${PRIVACYMGRSTATUS}" = "FAILED" )
 		{
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 			Hangup();
 			return;
@@ -2138,7 +2138,7 @@ context homeline {
 			verbose(direct is XXX#${direct}XXXX);
 			Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
 			Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
 			switch(${direct})
 			{
@@ -2223,7 +2223,7 @@ context homeline {
 		
 	}
 	1 => {  // Sonya
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 			goto s|loopback;
@@ -2421,51 +2421,51 @@ context homeline-kids {
 		Background(murphy-homeline-kids);        //  Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
 	}
 	1 => {  // SEAN
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
 			// &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
 			&std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	2 => {  // ERIC
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 			Voicemail(u4);
 			goto homeline|s|loopback;
 			
 			// SetMusicOnHold(erics);
-			// TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			// TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 			// &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
 			// goto homeline|s|loopback;
 	}
 	3 => {  // RYAN
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	4 => {  // KYLE
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	5 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 			
 	}
 	6 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	7 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
@@ -2517,7 +2517,7 @@ context workline {
                                               // Otherwise, dial 1, and hopefully, you will reach Steve.
 	}
 	1 => {
-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 		TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
 		
 		&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
@@ -2778,7 +2778,7 @@ context homeext {
 	}
 	761 => {
 		Record(announcement:gsm);
-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
 		goto s|loopback;
 	}
 	762 => {
diff --git a/pbx/ael/ael-test/ael-vtest13/extensions.ael b/pbx/ael/ael-test/ael-vtest13/extensions.ael
index b7e953e..48baaef 100755
--- a/pbx/ael/ael-test/ael-vtest13/extensions.ael
+++ b/pbx/ael/ael-test/ael-vtest13/extensions.ael
@@ -2048,7 +2048,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
 
 macro callerid-liar()
 {
-	TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
+	TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
 	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their 
                             //         faces to get in the front door, and unidentified callers won't fair
                             //         any better. You entered *MY* phone number. That won't work.
@@ -2105,7 +2105,7 @@ context homeline {
 		PrivacyManager();
 		if( "${PRIVACYMGRSTATUS}" = "FAILED" )
 		{
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 			Hangup();
 			return;
@@ -2137,7 +2137,7 @@ context homeline {
 			verbose(direct is XXX#${direct}XXXX);
 			Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
 			Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
 			switch(${direct})
 			{
@@ -2222,7 +2222,7 @@ context homeline {
 		
 	}
 	1 => {  // Sonya
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 			goto s|loopback;
@@ -2420,51 +2420,51 @@ context homeline-kids {
 		Background(murphy-homeline-kids);        //  Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
 	}
 	1 => {  // SEAN
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
 			// &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
 			&std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	2 => {  // ERIC
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 			Voicemail(u4);
 			goto homeline|s|loopback;
 			
 			// SetMusicOnHold(erics);
-			// TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			// TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 			// &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
 			// goto homeline|s|loopback;
 	}
 	3 => {  // RYAN
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	4 => {  // KYLE
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	5 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 			
 	}
 	6 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	7 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
@@ -2516,7 +2516,7 @@ context workline {
                                               // Otherwise, dial 1, and hopefully, you will reach Steve.
 	}
 	1 => {
-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 		TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
 		
 		&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
@@ -2777,7 +2777,7 @@ context homeext {
 	}
 	761 => {
 		Record(announcement:gsm);
-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
 		goto s|loopback;
 	}
 	762 => {
diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13
index 79a5e48..cf1d255 100644
--- a/pbx/ael/ael-test/ref.ael-vtest13
+++ b/pbx/ael/ael-test/ref.ael-vtest13
@@ -2107,7 +2107,7 @@ exten => s,20,Return()
 
 
 [callerid-liar]
-exten => s,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
+exten => s,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&)
 exten => s,2,Background(priv-liar)
 exten => s,3,Hangup()
 exten => s,4,Return()
@@ -2142,7 +2142,7 @@ exten => s,3,Set(repeatcount=0)
 exten => s,4,Zapateller(nocallerid)
 exten => s,5,PrivacyManager()
 exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
-exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
+exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
 exten => s,8,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
 exten => s,9,Hangup()
 exten => s,10,Return()
@@ -2168,7 +2168,7 @@ exten => s,29,GotoIf($["${direct}" != "" & ${direct} != 0 ]?30:37)
 exten => s,30,verbose(direct is XXX#${direct}XXXX)
 exten => s,31,Playback(greetings/direct)
 exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
-exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
 exten => s,35,Goto(sw-92-${direct},10)
 exten => s,36,NoOp(Finish switch-if-homeline-91-92)
@@ -2247,7 +2247,7 @@ exten => sw-92-2,10,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket
 exten => sw-92-2,11,Goto(s,loopback)
 exten => sw-92-1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
 exten => sw-92-1,11,Goto(s,loopback)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
 exten => 1,3,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
 exten => 1,4,Goto(s,loopback)
@@ -2324,31 +2324,31 @@ exten => o,1,Goto(s,begin)
 
 [homeline-kids]
 exten => s,1(begin),Background(murphy-homeline-kids)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
 exten => 1,3,Gosub(std-priv-exten,s,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
 exten => 1,4,Goto(homeline,s,loopback)
-exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 2,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
 exten => 2,3,Voicemail(u4)
 exten => 2,4,Goto(homeline,s,loopback)
-exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 3,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
 exten => 3,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
 exten => 3,4,Goto(homeline,s,loopback)
-exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 4,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
 exten => 4,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
 exten => 4,4,Goto(homeline,s,loopback)
-exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 5,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
 exten => 5,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
 exten => 5,4,Goto(homeline,s,loopback)
-exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 6,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
 exten => 6,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
 exten => 6,4,Goto(homeline,s,loopback)
-exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 7,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
 exten => 7,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
 exten => 7,4,Goto(homeline,s,loopback)
@@ -2376,7 +2376,7 @@ exten => s,5,Gosub(fillcidname,s,1)
 exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
 exten => s,7(loopback),Background(greetings/greeting)
 exten => s,8,Background(murphy-office-intro1)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
 exten => 1,3,Gosub(std-priv-exten,s,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
 exten => 1,4,Goto(s,loopback)
@@ -2502,7 +2502,7 @@ exten => 6,1,Background(recording)
 exten => 760,1,DateTime()
 exten => 760,2,Goto(s,loopback)
 exten => 761,1,Record(announcement:gsm)
-exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
+exten => 761,2,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&)
 exten => 761,3,Goto(s,loopback)
 exten => 762,1,agi(tts-riddle.agi)
 exten => 762,2,Background(gsm/what-time-it-is2)
-- 
1.6.1


0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	4 Jan 2009 17:23:21 -0000	1.6
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	4 Jan 2009 18:58:38 -0000	1.7
@@ -1,7 +1,7 @@
 From 0040bd97782e9db8c341af9ffe171749644e35f1 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 18 Nov 2007 21:47:59 -0600
-Subject: [PATCH 01/13] Modify init scripts for better Fedora compatibility.
+Subject: [PATCH 01/14] Modify init scripts for better Fedora compatibility.
 
 ---
  contrib/init.d/rc.redhat.asterisk |   61 +++++++++++++++++-------------------

0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:

Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	4 Jan 2009 17:23:22 -0000	1.6
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	4 Jan 2009 18:58:38 -0000	1.7
@@ -1,7 +1,7 @@
 From 42cd072beba88049783a7bedb029760a5952706e Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 15:52:36 -0600
-Subject: [PATCH 02/13] Modify modules.conf so that different voicemail modules can be loaded.
+Subject: [PATCH 02/14] Modify modules.conf so that different voicemail modules can be loaded.
 
 ---
  configs/modules.conf.sample |   27 +++++++++++++++++++++++++++

0003-Allow-alternate-extensions-to-be-specified-in-users.patch:

Index: 0003-Allow-alternate-extensions-to-be-specified-in-users.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0003-Allow-alternate-extensions-to-be-specified-in-users.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0003-Allow-alternate-extensions-to-be-specified-in-users.patch	4 Jan 2009 17:23:22 -0000	1.5
+++ 0003-Allow-alternate-extensions-to-be-specified-in-users.patch	4 Jan 2009 18:58:38 -0000	1.6
@@ -1,7 +1,7 @@
 From a9d27e3b5f93ff8658fa06a0c454140f27244363 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 16:32:56 -0600
-Subject: [PATCH 03/13] Allow alternate extensions to be specified in users.conf
+Subject: [PATCH 03/14] Allow alternate extensions to be specified in users.conf
 
 ---
  pbx/pbx_config.c |   14 ++++++++++++++

0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch:

Index: 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	4 Jan 2009 17:23:22 -0000	1.5
+++ 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	4 Jan 2009 18:58:38 -0000	1.6
@@ -1,7 +1,7 @@
 From 42991016984f9e7930686527706ab0f36baa41d1 Mon Sep 17 00:00:00 2001
 From: tilghman <tilghman at 614ede4d-c843-0410-af14-a771ab80d22e>
 Date: Tue, 29 Jul 2008 23:00:45 +0000
-Subject: [PATCH 04/13] Minor changes to reduce packaging changes made by the Fedora maintainer.
+Subject: [PATCH 04/14] Minor changes to reduce packaging changes made by the Fedora maintainer.
  (closes issue #12974)
   Reported by: jcollie
   Patches:

0005-Add-chan_mobile-from-asterisk-addons.patch:

Index: 0005-Add-chan_mobile-from-asterisk-addons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0005-Add-chan_mobile-from-asterisk-addons.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0005-Add-chan_mobile-from-asterisk-addons.patch	4 Jan 2009 17:23:22 -0000	1.5
+++ 0005-Add-chan_mobile-from-asterisk-addons.patch	4 Jan 2009 18:58:38 -0000	1.6
@@ -1,7 +1,7 @@
 From 8cc8002094fe880d374a727aa0be389ca68b0342 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 09:23:28 -0600
-Subject: [PATCH 05/13] Add chan_mobile from asterisk-addons.
+Subject: [PATCH 05/14] Add chan_mobile from asterisk-addons.
 
 ---
  build_tools/menuselect-deps.in |    1 +

0006-Use-pkgconfig-to-check-for-Lua.patch:

Index: 0006-Use-pkgconfig-to-check-for-Lua.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0006-Use-pkgconfig-to-check-for-Lua.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0006-Use-pkgconfig-to-check-for-Lua.patch	4 Jan 2009 17:23:22 -0000	1.5
+++ 0006-Use-pkgconfig-to-check-for-Lua.patch	4 Jan 2009 18:58:38 -0000	1.6
@@ -1,7 +1,7 @@
 From d633181f75ea7dc879e8ac9d014cf1fc0fe364ef Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 13:14:23 -0600
-Subject: [PATCH 06/13] Use pkgconfig to check for Lua.
+Subject: [PATCH 06/14] Use pkgconfig to check for Lua.
 
 ---
  configure.ac |    9 ++++++++-

0007-Build-using-external-libedit.patch:

Index: 0007-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0007-Build-using-external-libedit.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0007-Build-using-external-libedit.patch	4 Jan 2009 17:23:22 -0000	1.5
+++ 0007-Build-using-external-libedit.patch	4 Jan 2009 18:58:38 -0000	1.6
@@ -1,7 +1,7 @@
 From a50090dc47540b5c3df28c9846fe753f5476c4fc Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Tue, 25 Mar 2008 00:50:27 -0500
-Subject: [PATCH 07/13] Build using external libedit.
+Subject: [PATCH 07/14] Build using external libedit.
 
 ---
  build_tools/menuselect-deps.in |    1 +

0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch:

Index: 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch	4 Jan 2009 17:23:22 -0000	1.2
+++ 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch	4 Jan 2009 18:58:38 -0000	1.3
@@ -1,7 +1,7 @@
 From a092080315b7bfa9b7d174b6114cb957ac1590d8 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Fri, 10 Oct 2008 11:54:10 -0500
-Subject: [PATCH 08/13] Revert changes to pbx_lua from rev 126363 that cause some problems.
+Subject: [PATCH 08/14] Revert changes to pbx_lua from rev 126363 that cause some problems.
 
 ---
  pbx/pbx_lua.c |    6 +++---

0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch:

Index: 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	4 Jan 2009 17:23:22 -0000	1.2
+++ 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	4 Jan 2009 18:58:38 -0000	1.3
@@ -1,7 +1,7 @@
 From 7719af5a016f40f573c90aae17910f7f77b9b4e6 Mon Sep 17 00:00:00 2001
 From: Caolan McNamara <caolanm at redhat.com>
 Date: Sat, 3 Jan 2009 19:06:18 -0600
-Subject: [PATCH 09/13] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
+Subject: [PATCH 09/14] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
 
 ---
  configure.ac |   12 +++++++++++-

0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch:

Index: 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch	4 Jan 2009 17:23:22 -0000	1.2
+++ 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch	4 Jan 2009 18:58:38 -0000	1.3
@@ -1,7 +1,7 @@
 From 9a6c4641b2aa353c9076df9794d72fba5acdafb0 Mon Sep 17 00:00:00 2001
 From: Caolan McNamara <caolanm at redhat.com>
 Date: Sat, 3 Jan 2009 19:12:18 -0600
-Subject: [PATCH 10/13] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail
+Subject: [PATCH 10/14] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail
 
 Need to regenerate configure from configure.ac after patch one with
 ./bootsrap.sh, so fix the broken .m4 in the autoconfig dir. (alternatively

0011-Merged-revisions-160170-160172-via-svnmerge-from.patch:

Index: 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0011-Merged-revisions-160170-160172-via-svnmerge-from.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch	4 Jan 2009 17:23:22 -0000	1.2
+++ 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch	4 Jan 2009 18:58:38 -0000	1.3
@@ -1,7 +1,7 @@
 From c38fa4eb3cf989c110a737058c46a916ebab19c8 Mon Sep 17 00:00:00 2001
 From: seanbright <seanbright at f38db490-d61c-443f-a65b-d21fe96a405b>
 Date: Mon, 1 Dec 2008 23:41:16 +0000
-Subject: [PATCH 11/13] Merged revisions 160170-160172 via svnmerge from
+Subject: [PATCH 11/14] Merged revisions 160170-160172 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/trunk
 
 ................

0012-Merged-revisions-162275-via-svnmerge-from.patch:

Index: 0012-Merged-revisions-162275-via-svnmerge-from.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0012-Merged-revisions-162275-via-svnmerge-from.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0012-Merged-revisions-162275-via-svnmerge-from.patch	4 Jan 2009 17:23:22 -0000	1.1
+++ 0012-Merged-revisions-162275-via-svnmerge-from.patch	4 Jan 2009 18:58:38 -0000	1.2
@@ -1,7 +1,7 @@
 From 986c677766137383378252947eafb3eb8c86718a Mon Sep 17 00:00:00 2001
 From: file <file at f38db490-d61c-443f-a65b-d21fe96a405b>
 Date: Tue, 9 Dec 2008 20:47:11 +0000
-Subject: [PATCH 12/13] Merged revisions 162275 via svnmerge from
+Subject: [PATCH 12/14] Merged revisions 162275 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/trunk
 
 ................

0013-Update-autoconf.patch:

Index: 0013-Update-autoconf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0013-Update-autoconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0013-Update-autoconf.patch	4 Jan 2009 17:23:24 -0000	1.1
+++ 0013-Update-autoconf.patch	4 Jan 2009 18:58:38 -0000	1.2
@@ -1,7 +1,7 @@
 From 249cd4bd1b4b9a0b99a07d44359e098c10dacbdb Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 4 Jan 2009 00:37:02 -0600
-Subject: [PATCH 13/13] Update autoconf.
+Subject: [PATCH 13/14] Update autoconf.
 
 ---
  configure                        |23025 ++++++++++++++++++++------------------


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/asterisk.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- asterisk.spec	4 Jan 2009 17:23:24 -0000	1.39
+++ asterisk.spec	4 Jan 2009 18:58:38 -0000	1.40
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -46,6 +46,7 @@
 Patch11: 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch
 Patch12: 0012-Merged-revisions-162275-via-svnmerge-from.patch
 Patch13: 0013-Update-autoconf.patch
+Patch14: 0014-Fix-up-some-paths.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -423,6 +424,7 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -521,8 +523,10 @@
 mkdir -p %{buildroot}%{_datadir}/asterisk/sounds/
 mkdir -p %{buildroot}%{_localstatedir}/lib/asterisk
 mkdir -p %{buildroot}%{_localstatedir}/log/asterisk/cdr-custom/
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/festival/
 mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/monitor/
 mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/outgoing/
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/uploads/
 
 # We're not going to package any of the sample AGI scripts
 rm -f %{buildroot}%{_datadir}/asterisk/agi-bin/*
@@ -687,7 +691,6 @@
 %{_libdir}/asterisk/modules/func_callerid.so
 %{_libdir}/asterisk/modules/func_cdr.so
 %{_libdir}/asterisk/modules/func_channel.so
-%{_libdir}/asterisk/modules/func_curl.so
 %{_libdir}/asterisk/modules/func_cut.so
 %{_libdir}/asterisk/modules/func_db.so
 %{_libdir}/asterisk/modules/func_devstate.so
@@ -825,6 +828,7 @@
 %attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/monitor/
 %attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/outgoing/
 %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/tmp/
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/uploads/
 %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/voicemail/
 
 %attr(0755,asterisk,asterisk) %dir %{_localstatedir}/run/asterisk
@@ -886,6 +890,7 @@
 %files festival
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/asterisk/festival.conf
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/festival/
 %{_libdir}/asterisk/modules/app_festival.so
 
 %files firmware
@@ -1032,6 +1037,10 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-3
+- Don't package func_curl in the main package. BZ#475910
+- Fix up paths. BZ#477238
+
 * Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-2
 - Add patch to fix compilation on PPC
 


