rpms/asterisk/devel .cvsignore, 1.25, 1.26 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch, 1.11, 1.12 asterisk.spec, 1.63, 1.64 sources, 1.25, 1.26

[Jeffrey C. Ollie]

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29446

Modified Files:
	.cvsignore 
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	asterisk.spec sources 
Log Message:
* Fri Nov  6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.10.rc4
- Update to 1.6.2.0-rc4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	6 Nov 2009 01:04:34 -0000	1.25
+++ .cvsignore	6 Nov 2009 22:37:01 -0000	1.26
@@ -1,2 +1,2 @@
-asterisk-1.6.2.0-rc3.tar.gz
-asterisk-1.6.2.0-rc3.tar.gz.asc
+asterisk-1.6.2.0-rc4.tar.gz
+asterisk-1.6.2.0-rc4.tar.gz.asc

0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:
 init.d/rc.redhat.asterisk |   76 ++++++++++++++++++++--------------------------
 sysconfig/asterisk        |   19 +++++++++++
 2 files changed, 53 insertions(+), 42 deletions(-)

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	25 Oct 2009 01:25:55 -0000	1.11
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	6 Nov 2009 22:37:02 -0000	1.12
@@ -1,6 +1,6 @@
 Index: contrib/init.d/rc.redhat.asterisk
 ===================================================================
---- contrib/init.d/rc.redhat.asterisk	(revision 225759)
+--- contrib/init.d/rc.redhat.asterisk	(revision 228657)
 +++ contrib/init.d/rc.redhat.asterisk	(working copy)
 @@ -3,7 +3,7 @@
  #
@@ -114,13 +114,21 @@ Index: contrib/init.d/rc.redhat.asterisk
  	RETVAL=$?
  	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/asterisk
  	echo
-@@ -99,7 +97,7 @@
+@@ -98,14 +96,8 @@
+ }
  
  stop() {
- 	# Stop daemons.
+-	# Stop daemons.
+-	if [ -f $SAFE_ASTERISK ]; then
+-		# Kill safe_asterisk first, to prevent us from starting up 2 instances of safe_asterisk
+-		echo -n $"Stopping safe_asterisk: "
+-		killproc `basename $SAFE_ASTERISK`
+-		echo
+-	fi
 -	echo -n $"Shutting down asterisk: "
++	# Stop daemon.
 +	echo -n $"Stopping asterisk: "
- 	killproc asterisk
+ 	killproc `basename $DAEMON`
  	RETVAL=$?
  	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/asterisk
 Index: contrib/sysconfig/asterisk


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- asterisk.spec	6 Nov 2009 01:04:34 -0000	1.63
+++ asterisk.spec	6 Nov 2009 22:37:02 -0000	1.64
@@ -1,8 +1,8 @@
-%define _rc 3
+%define _rc 4
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.2.0
-Release: 0.9%{?_rc:.rc%{_rc}}%{?dist}
+Release: 0.10%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -22,7 +22,6 @@ Patch5:  0005-Build-using-external-libed
 Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
 Patch11: 0011-Fix-up-some-paths.patch
 Patch12: 0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
-Patch13: 0013-res_http_post-path-issue.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -389,7 +388,6 @@ local filesystem.
 %patch8 -p0
 %patch11 -p0
 %patch12 -p1
-%patch13 -p0
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -1013,6 +1011,9 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Fri Nov  6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.10.rc4
+- Update to 1.6.2.0-rc4
+
 * Tue Oct 27 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.9.rc3
 - Add patch from upstream to fix how res_http_post forms paths.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	6 Nov 2009 01:04:34 -0000	1.25
+++ sources	6 Nov 2009 22:37:02 -0000	1.26
@@ -1,2 +1,2 @@
-86391d9be841fc79806b79232f2b5236  asterisk-1.6.2.0-rc3.tar.gz
-69b8abefaf8d4a8abfa1b75b7e83d0d6  asterisk-1.6.2.0-rc3.tar.gz.asc
+3ef88fa18fcf0e3b080603ccced0b5cb  asterisk-1.6.2.0-rc4.tar.gz
+e4adcf6eda8da0f3e88e5f6f980e39fc  asterisk-1.6.2.0-rc4.tar.gz.asc