Fri Oct 10 21:11:44 UTC 2008

Author: jcollie

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

Modified Files:
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0003-Add-FAX-apps.patch 
	0004-Latest-updates-for-app_conference.patch 
	0005-Allow-alternate-extensions-to-be-specified-in-users.patch 
	0006-Pick-proper-optimization-flags-for-Fedora.patch 
	0007-Add-chan_mobile-backported-from-asterisk-addons-tru.patch 
	0008-Build-using-external-libedit.patch 
	0009-Update-Autoconf.patch asterisk.spec 
Log Message:
* Fri Oct 10 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.22-2
- Fix problem with init script patch
- Build against DAHDI instead of Zaptel.


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-8/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	8 Oct 2008 21:16:50 -0000	1.1
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	10 Oct 2008 21:11:13 -0000	1.2
@@ -1,16 +1,16 @@
-From 270b2599142af4097780f0ce2feac7e4a4570061 Mon Sep 17 00:00:00 2001
+From 0d078299bda883060d086e4b331e5b713bae02a9 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] Modify init scripts for better Fedora compatibility.
 
 ---
- contrib/init.d/rc.redhat.asterisk |   59 +++++++++++++++++-------------------
+ contrib/init.d/rc.redhat.asterisk |   61 +++++++++++++++++-------------------
  contrib/sysconfig/asterisk        |   16 ++++++++++
- 2 files changed, 44 insertions(+), 31 deletions(-)
+ 2 files changed, 45 insertions(+), 32 deletions(-)
  create mode 100644 contrib/sysconfig/asterisk
 
 diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
-index d2a630e..51e3459 100755
+index d2a630e..7ac830d 100755
 --- a/contrib/init.d/rc.redhat.asterisk
 +++ b/contrib/init.d/rc.redhat.asterisk
 @@ -3,7 +3,7 @@
@@ -110,6 +110,15 @@
  	if [ $AST_USER ] ; then
  		ASTARGS="-U $AST_USER"
  	fi
+@@ -88,7 +85,7 @@ start() {
+ 		ASTARGS="$ASTARGS -G $AST_GROUP"
+ 	fi
+ 	if [ $AST_CONFIG ]; then
+-		ASTARGS="$ASTARGS -C $AST_CONFIG/asterisk.conf"
++		ASTARGS="$ASTARGS -C $AST_CONFIG"
+ 	fi
+ 	daemon $DAEMON $ASTARGS
+ 	RETVAL=$?
 @@ -99,7 +96,7 @@ start() {
  
  stop() {

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-8/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	8 Oct 2008 21:16:50 -0000	1.1
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	10 Oct 2008 21:11:13 -0000	1.2
@@ -1,4 +1,4 @@
-From f2fd0ae038469a36862645e6791bae6373e4b9cf Mon Sep 17 00:00:00 2001
+From 59c3a474d2ae39b2ce9c5ce9aa46c265e05cbb20 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] Modify modules.conf so that different voicemail modules can be loaded.

0003-Add-FAX-apps.patch:

Index: 0003-Add-FAX-apps.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-8/0003-Add-FAX-apps.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0003-Add-FAX-apps.patch	8 Oct 2008 21:16:50 -0000	1.1
+++ 0003-Add-FAX-apps.patch	10 Oct 2008 21:11:13 -0000	1.2
@@ -1,4 +1,4 @@
-From c43427a6a0476ddfbc1c9ff1ab66a783a5216c21 Mon Sep 17 00:00:00 2001
+From 9fac81256af4d0d28b1ef4eacdbb5b308d383e30 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 12 Nov 2007 15:51:12 -0600
 Subject: [PATCH] Add FAX apps.

0004-Latest-updates-for-app_conference.patch:

Index: 0004-Latest-updates-for-app_conference.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-8/0004-Latest-updates-for-app_conference.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0004-Latest-updates-for-app_conference.patch	8 Oct 2008 21:16:50 -0000	1.1
+++ 0004-Latest-updates-for-app_conference.patch	10 Oct 2008 21:11:13 -0000	1.2
@@ -1,4 +1,4 @@
-From d0a9a5e65b0c0b2d5184134627a5a8b819237759 Mon Sep 17 00:00:00 2001
+From 5bf80a4fd5ae7958be04be1add3c85acb7ec09d8 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 18 Feb 2008 08:58:05 -0600
 Subject: [PATCH] Latest updates for app_conference.

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

Index: 0005-Allow-alternate-extensions-to-be-specified-in-users.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-8/0005-Allow-alternate-extensions-to-be-specified-in-users.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0005-Allow-alternate-extensions-to-be-specified-in-users.patch	8 Oct 2008 21:16:51 -0000	1.1
+++ 0005-Allow-alternate-extensions-to-be-specified-in-users.patch	10 Oct 2008 21:11:14 -0000	1.2
@@ -1,4 +1,4 @@
-From b40ab3aac1281ae97b5ce610db78e299301f2535 Mon Sep 17 00:00:00 2001
+From ab984e45398fa9d4cb0f96be1534877dd06f66e9 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] Allow alternate extensions to be specified in users.conf

0006-Pick-proper-optimization-flags-for-Fedora.patch:

Index: 0006-Pick-proper-optimization-flags-for-Fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-8/0006-Pick-proper-optimization-flags-for-Fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0006-Pick-proper-optimization-flags-for-Fedora.patch	8 Oct 2008 21:16:51 -0000	1.1
+++ 0006-Pick-proper-optimization-flags-for-Fedora.patch	10 Oct 2008 21:11:14 -0000	1.2
@@ -1,4 +1,4 @@
-From 6dd70348aaadbf5df35a6bf045109cb2b5a68aa3 Mon Sep 17 00:00:00 2001
+From 7d820b0ab368c4f478b2ff4d828d0893e18ea022 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 16:42:14 -0600
 Subject: [PATCH] Pick proper optimization flags for Fedora.

0007-Add-chan_mobile-backported-from-asterisk-addons-tru.patch:

Index: 0007-Add-chan_mobile-backported-from-asterisk-addons-tru.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-8/0007-Add-chan_mobile-backported-from-asterisk-addons-tru.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0007-Add-chan_mobile-backported-from-asterisk-addons-tru.patch	8 Oct 2008 21:16:51 -0000	1.1
+++ 0007-Add-chan_mobile-backported-from-asterisk-addons-tru.patch	10 Oct 2008 21:11:14 -0000	1.2
@@ -1,4 +1,4 @@
-From 6329cd414f241dd090f9d536e7fdb6207ec2c342 Mon Sep 17 00:00:00 2001
+From 897b0e69ce1e786ba20e019d608e6ee076905f2e Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 18 Nov 2007 22:25:43 -0600
 Subject: [PATCH] Add chan_mobile (backported from asterisk-addons trunk).

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

Index: 0008-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-8/0008-Build-using-external-libedit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0008-Build-using-external-libedit.patch	8 Oct 2008 21:16:51 -0000	1.1
+++ 0008-Build-using-external-libedit.patch	10 Oct 2008 21:11:14 -0000	1.2
@@ -1,4 +1,4 @@
-From 53948b88efd76f77794f20acebcd8a4256a30b03 Mon Sep 17 00:00:00 2001
+From 016b626e7243d065c57a2dde2fdd6dc0be019060 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 23 Mar 2008 19:49:34 -0500
 Subject: [PATCH] Build using external libedit.

0009-Update-Autoconf.patch:

Index: 0009-Update-Autoconf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-8/0009-Update-Autoconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0009-Update-Autoconf.patch	8 Oct 2008 21:16:51 -0000	1.1
+++ 0009-Update-Autoconf.patch	10 Oct 2008 21:11:14 -0000	1.2
@@ -1,4 +1,4 @@
-From be21bfb811195c0dad109c69174edd8e90587347 Mon Sep 17 00:00:00 2001
+From 3b9eb135fb5cf3f50416cb38a36bd6ac582071c0 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Wed, 8 Oct 2008 14:35:11 -0500
 Subject: [PATCH] Update Autoconf.


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-8/asterisk.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- asterisk.spec	8 Oct 2008 21:16:17 -0000	1.24
+++ asterisk.spec	10 Oct 2008 21:11:14 -0000	1.25
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.4.22
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -128,9 +128,9 @@
 Summary: Modules for Asterisk that use DAHDI
 Group: Applications/Internet
 Requires: asterisk = %{version}-%{release}
-Requires: zaptel >= 1.4.12.1
+Requires: dahdi-tools >= 2.0.0
 Requires(pre): %{_sbindir}/usermod
-BuildRequires: zaptel-devel >= 1.4.12.1
+BuildRequires: dahdi-tools-devel >= 2.0.0
 BuildRequires: libpri-devel >= 1.4.7
 Obsoletes: asterisk-zaptel <= 1.4.21.2-3
 Provides: asterisk-zaptel = %{version}-%{release}
@@ -460,12 +460,12 @@
         /sbin/chkconfig --del asterisk
 fi
 
+%pre dahdi
+%{_sbindir}/usermod -a -G dahdi asterisk
+
 %pre misdn
 %{_sbindir}/usermod -a -G misdn asterisk
 
-%pre dahdi
-%{_sbindir}/usermod -a -G zaptel asterisk
-
 %files
 %defattr(-,root,root,-)
 %doc README* *.txt ChangeLog BUGS CREDITS configs
@@ -903,6 +903,10 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Fri Oct 10 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.22-2
+- Fix problem with init script patch
+- Build against DAHDI instead of Zaptel.
+
 * Wed Oct  8 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.22-1
 - Update to 1.4.22
 - Zaptel has been renamed to DAHDI (due to trademark issues) but we


