Mon Sep 7 05:43:14 UTC 2009

Author: jcollie

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

Modified Files:
	.cvsignore 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0005-Build-using-external-libedit.patch 
	0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	asterisk.spec menuselect.makeopts sources 
Removed Files:
	0003-Add-chan_mobile-from-asterisk-addons.patch 
	0004-Use-pkgconfig-to-check-for-Lua.patch 
	0007-Define-missing-variable-when-compiling-on-PPC.patch 
	0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 
	0013-Bridging-work-as-of-svn-rev-174216.patch 
	0014-Adding-in-CLI-apps.patch 0015-Update-autoconf.patch 
	0016-pagecount.patch 
Log Message:
* Sun Sep  6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.6-1
- Update to 1.6.1.6
- Drop patches that are too troublesome to maintain anymore or have been integrated upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22

--- .cvsignore	5 Mar 2009 14:12:22 -0000	1.21
+++ .cvsignore	7 Sep 2009 05:43:12 -0000	1.22
@@ -1,3 +1,3 @@
-asterisk-1.6.1-rc1-stripped.tar.gz
-asterisk-1.6.1-rc1.tar.gz.asc
+asterisk-1.6.1.6-stripped.tar.gz
+asterisk-1.6.1.6.tar.gz.asc
 asterisk-developer-pubring.gpg

0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:
 modules.conf.sample |   26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	9 Feb 2009 05:54:21 -0000	1.10
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	7 Sep 2009 05:43:12 -0000	1.11
@@ -1,20 +1,11 @@
-From fa2cd0b2b289e51cba4329c420d2da1855f860c5 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/15] Modify modules.conf so that different voicemail modules can be loaded.
-
----
- configs/modules.conf.sample |   26 ++++++++++++++++++++++++++
- 1 files changed, 26 insertions(+), 0 deletions(-)
-
-diff --git a/configs/modules.conf.sample b/configs/modules.conf.sample
-index 8f73de1..7dd8940 100644
---- a/configs/modules.conf.sample
-+++ b/configs/modules.conf.sample
-@@ -44,3 +44,29 @@ noload => chan_alsa.so
- ; 
- ;noload => res_timing_dahdi.so
- ;noload => res_timing_pthread.so
+Index: configs/modules.conf.sample
+===================================================================
+--- configs/modules.conf.sample	(revision 216642)
++++ configs/modules.conf.sample	(working copy)
+@@ -38,3 +38,29 @@
+ ;noload => chan_oss.so
+ noload => chan_console.so
+ ;
 +
 +;
 +; Voicemail storage selection
@@ -41,6 +32,3 @@ index 8f73de1..7dd8940 100644
 +;
 +;noload => app_directory_plain.so
 +;noload => app_voicemail_plain.so
--- 
-1.6.1
-

0005-Build-using-external-libedit.patch:
 build_tools/menuselect-deps.in |    1 +
 configure.ac                   |   22 ++++++++++++++++++++++
 main/Makefile                  |    8 +++++---
 main/cli.c                     |    3 ++-
 makeopts.in                    |    4 ++++
 5 files changed, 34 insertions(+), 4 deletions(-)

Index: 0005-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0005-Build-using-external-libedit.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- 0005-Build-using-external-libedit.patch	9 Feb 2009 05:54:21 -0000	1.5
+++ 0005-Build-using-external-libedit.patch	7 Sep 2009 05:43:12 -0000	1.6
@@ -1,21 +1,8 @@
-From 64a709b530b0fc1dd74805641f7279a6f83e97b7 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 05/15] Build using external libedit.
-
----
- build_tools/menuselect-deps.in |    1 +
- configure.ac                   |   22 ++++++++++++++++++++++
- main/Makefile                  |    8 +++++---
- main/cli.c                     |    3 ++-
- makeopts.in                    |    4 ++++
- 5 files changed, 34 insertions(+), 4 deletions(-)
-
-diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
-index 6d94984..7832687 100644
---- a/build_tools/menuselect-deps.in
-+++ b/build_tools/menuselect-deps.in
-@@ -18,6 +18,7 @@ ISDNNET=@PBX_ISDNNET@
+Index: build_tools/menuselect-deps.in
+===================================================================
+--- build_tools/menuselect-deps.in	(revision 216642)
++++ build_tools/menuselect-deps.in	(working copy)
+@@ -17,6 +17,7 @@
  IXJUSER=@PBX_IXJUSER@
  JACK=@PBX_JACK@
  LDAP=@PBX_LDAP@
@@ -23,11 +10,11 @@ index 6d94984..7832687 100644
  LTDL=@PBX_LTDL@
  LUA=@PBX_LUA@
  MISDN=@PBX_MISDN@
-diff --git a/configure.ac b/configure.ac
-index 4519ec9..891548f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -230,6 +230,7 @@ AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 216642)
++++ configure.ac	(working copy)
+@@ -232,6 +232,7 @@
  AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
  AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
  AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
@@ -35,7 +22,7 @@ index 4519ec9..891548f 100644
  AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
  AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
  AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
-@@ -1602,6 +1603,27 @@ AC_SUBST(PBX_GTK2)
+@@ -1621,6 +1622,27 @@
  AC_SUBST(GTK2_INCLUDE)
  AC_SUBST(GTK2_LIB)
  
@@ -48,7 +35,7 @@ index 4519ec9..891548f 100644
 +   if test "${PKGCONFIG}" != "no"; then
 +      if ${PKGCONFIG} --exists libedit; then
 +         LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags)
-+	 LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs)
++         LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs)
 +         LIBEDIT_OBJ=
 +         PBX_LIBEDIT=1
 +         AC_DEFINE([HAVE_LIBEDIT], 1, [Define if your system has the NetBSD Editline libraries.])
@@ -63,26 +50,26 @@ index 4519ec9..891548f 100644
  if test "${USE_CURL}" != "no"; then
     AC_PATH_TOOL([CURL_CONFIG], [curl-config], No)
     if test ! x"${CURL_CONFIG}" = xNo; then
-diff --git a/main/Makefile b/main/Makefile
-index 446bbb2..86a0f3c 100644
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -138,6 +138,8 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
+Index: main/Makefile
+===================================================================
+--- main/Makefile	(revision 216642)
++++ main/Makefile	(working copy)
+@@ -129,6 +129,8 @@
  	$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
  	rm ast_expr2.o ast_expr2f.o 
  
 +cli.o: ASTCFLAGS+=$(LIBEDIT_INCLUDE)
 +
  ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
- http.o: ASTCFLAGS+=$(GMIME_INCLUDE)
+ http.o: _ASTCFLAGS+=$(GMIME_INCLUDE)
  endif
-@@ -170,13 +172,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
+@@ -161,13 +163,13 @@
  GMIMELDFLAGS+=$(GMIME_LIB)
  endif
  
 -$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
 +$(MAIN_TGT): $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
- 	@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
+ 	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
  	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
  ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
 -	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
@@ -93,11 +80,11 @@ index 446bbb2..86a0f3c 100644
  endif
  	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
  
-diff --git a/main/cli.c b/main/cli.c
-index f6982ad..286d775 100644
---- a/main/cli.c
-+++ b/main/cli.c
-@@ -34,6 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+Index: main/cli.c
+===================================================================
+--- main/cli.c	(revision 216642)
++++ main/cli.c	(working copy)
+@@ -34,6 +34,8 @@
  #include <ctype.h>
  #include <regex.h>
  
@@ -106,7 +93,7 @@ index f6982ad..286d775 100644
  #include "asterisk/cli.h"
  #include "asterisk/linkedlists.h"
  #include "asterisk/module.h"
-@@ -42,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+@@ -42,7 +44,6 @@
  #include "asterisk/utils.h"
  #include "asterisk/app.h"
  #include "asterisk/lock.h"
@@ -114,11 +101,11 @@ index f6982ad..286d775 100644
  #include "asterisk/threadstorage.h"
  
  /*!
-diff --git a/makeopts.in b/makeopts.in
-index a5b2a5f..e2a8306 100644
---- a/makeopts.in
-+++ b/makeopts.in
-@@ -249,3 +249,7 @@ TINFO_DIR=@TINFO_DIR@
+Index: makeopts.in
+===================================================================
+--- makeopts.in	(revision 216642)
++++ makeopts.in	(working copy)
+@@ -246,3 +246,7 @@
  
  # if poll is not present, let the makefile know.
  POLL_AVAILABLE=@HAS_POLL@
@@ -126,6 +113,3 @@ index a5b2a5f..e2a8306 100644
 +LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@
 +LIBEDIT_LIB=@LIBEDIT_LIB@
 +LIBEDIT_OBJ=@LIBEDIT_OBJ@
--- 
-1.6.1
-

0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch:
 configure.ac |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Index: 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	9 Feb 2009 05:54:21 -0000	1.4
+++ 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	7 Sep 2009 05:43:12 -0000	1.5
@@ -1,18 +1,9 @@
-From 0d6267e70e805371772d4375318d08437fe6b5ca 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 08/15] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
-
----
- configure.ac |   12 +++++++++++-
- 1 files changed, 11 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 891548f..5cfc205 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1475,7 +1475,17 @@ then
-     AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl])
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 216642)
++++ configure.ac	(working copy)
+@@ -1493,7 +1493,17 @@
+     AST_CHECK_OSPTK([3], [5], [0])
  fi
  
 -AST_EXT_TOOL_CHECK([GMIME], [gmime], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);])
@@ -30,6 +21,3 @@ index 891548f..5cfc205 100644
  
  AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], [])
  
--- 
-1.6.1
-


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- asterisk.spec	2 Sep 2009 02:53:49 -0000	1.54
+++ asterisk.spec	7 Sep 2009 05:43:14 -0000	1.55
@@ -1,9 +1,9 @@
 %define with_apidoc %{?_with_apidoc: 1} %{!?_with_apidoc: 0}
-%define _rc 1
+#define _rc 1
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.6.1
-Release: 0.26.%{?_rc:rc%{_rc}}%{?dist}
+Version: 1.6.1.6
+Release: 1%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -19,18 +19,18 @@ URL: http://www.asterisk.org/
 
 # MD5 Sums
 # ========
-# 29f7285b673d52b49d91c8e797acbbb0  asterisk-1.6.1-rc1.tar.gz
-# d77d5521c9e742c81356f49ebcf6051a  asterisk-1.6.1-rc1-stripped.tar.gz
+# 63a928373e741524aac09d8c078df7d5  asterisk-1.6.1.6.tar.gz
+# 4f57c6c9fff1bfeb9061679c123f7468  asterisk-1.6.1.6-stripped.tar.gz
 #
 # SHA1 Sums
 # =========
-# 517176cad6ecf1e223749ae927a5989f2d2c0c29  asterisk-1.6.1-rc1.tar.gz
-# 1fe8c924945ff04acd7883f086cf7f1ce0fc8d88  asterisk-1.6.1-rc1-stripped.tar.gz
+# 79a9a3635fdf2e8422dadabd9f05da3329e60dc1  asterisk-1.6.1.6.tar.gz
+# b6ef13ec7b7b2335cd98dec09f143f9f446d9bb1  asterisk-1.6.1.6-stripped.tar.gz
 #
 # SHA256 Sums
 # =========
-# 730dea578f72b51ff13f21320ff81f06e1c10a02a0f723b61c5bf8e47bee5e3b  asterisk-1.6.1-rc1.tar.gz
-# 93b2635208318c834917fad0a75fd59d04c282ca15d7dba2ba494cee22e88b73  asterisk-1.6.1-rc1-stripped.tar.gz
+# ce56be843b85946bebbb89af06819585f45dd50ac544c21ca81acab994036c22  asterisk-1.6.1.6.tar.gz
+# 4a91e3b8a420756f3b7b2b2d85335e0c47431bcaa8f02ea40e2c9ed835283fe3  asterisk-1.6.1.6-stripped.tar.gz
 
 Source0: asterisk-%{version}%{?_rc:-rc%{_rc}}-stripped.tar.gz
 Source1: asterisk-logrotate
@@ -42,25 +42,17 @@ Source6: asterisk-developer-pubring.gpg
 
 Patch1:  0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
 Patch2:  0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
-Patch3:  0003-Add-chan_mobile-from-asterisk-addons.patch
-Patch4:  0004-Use-pkgconfig-to-check-for-Lua.patch
 Patch5:  0005-Build-using-external-libedit.patch
 Patch6:  0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
-Patch7:  0007-Define-missing-variable-when-compiling-on-PPC.patch
 Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
-Patch9:  0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
 Patch10: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
 Patch11: 0011-Fix-up-some-paths.patch
 Patch12: 0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
-Patch13: 0013-Bridging-work-as-of-svn-rev-174216.patch
-Patch14: 0014-Adding-in-CLI-apps.patch
-Patch15: 0015-Update-autoconf.patch
-Patch16: 0016-pagecount.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
-#BuildRequires: autoconf
-#BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: automake
 
 # core build requirements
 BuildRequires: openssl-devel
@@ -103,6 +95,7 @@ Requires(preun): /sbin/service
 
 # asterisk-conference package removed since patch no longer compiles
 Obsoletes: asterisk-conference <= 1.6.0-0.14.beta9
+Obsoletes: asterisk-mobile <= 1.6.1-0.23.rc1
 
 %description
 Asterisk is a complete PBX in software. It runs on Linux and provides
@@ -139,15 +132,6 @@ Requires: asterisk = %{version}-%{releas
 API documentation for Asterisk.
 %endif
 
-#%package conference
-#Summary: Audio/video conferencing application for Asterisk
-#Group: Applications/Internet
-#Requires: asterisk = %{version}-%{release}
-#BuildRequires: speex-devel
-#
-#%description conference
-#Audio/video conferencing application for Asterisk.
-
 %package curl
 Summary: Modules for Asterisk that use cURL
 Group: Applications/Internet
@@ -284,16 +268,6 @@ Requires: asterisk = %{version}-%{releas
 %description minivm
 MiniVM application for Asterisk.
 
-%package mobile
-Summary: Asterisk channel driver for bluetooth phones and headsets
-Group: Applications/Internet
-Requires: asterisk = %{version}-%{release}
-BuildRequires: bluez-libs-devel
-
-%description mobile
-Asterisk channel driver to allow Bluetooth cell/mobile phones to be
-used as FXO devices, and headsets as FXS devices.
-
 %package odbc
 Summary: Applications for Asterisk that use ODBC (except voicemail)
 Group: Applications/Internet
@@ -443,21 +417,13 @@ local filesystem.
 %prep
 %setup0 -q -n asterisk-%{version}%{?_rc:-rc%{_rc}}
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch2 -p0
+%patch5 -p0
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+%patch8 -p0
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -476,16 +442,11 @@ chmod -x contrib/scripts/dbsep.cgi
 
 %build
 
-# if we are building for i386 promote the CPU arch to i486 for atomic operations support
-%ifarch i386
-%define optflags %{__global_cflags} -m32 -march=i486 -mtune=generic -fasynchronous-unwind-tables -Werror-implicit-function-declaration
-%else
 %define optflags %(rpm --eval %%{optflags}) -Werror-implicit-function-declaration
-%endif
 
-#aclocal -I autoconf
-#autoconf
-#autoheader
+aclocal -I autoconf
+autoconf
+autoheader
 
 pushd menuselect/mxml
 %configure
@@ -636,12 +597,10 @@ fi
 %{_libdir}/asterisk/modules/app_alarmreceiver.so
 %{_libdir}/asterisk/modules/app_amd.so
 %{_libdir}/asterisk/modules/app_authenticate.so
-%{_libdir}/asterisk/modules/app_bridgetest.so
 %{_libdir}/asterisk/modules/app_cdr.so
 %{_libdir}/asterisk/modules/app_chanisavail.so
 %{_libdir}/asterisk/modules/app_channelredirect.so
 %{_libdir}/asterisk/modules/app_chanspy.so
-%{_libdir}/asterisk/modules/app_confbridge.so
 %{_libdir}/asterisk/modules/app_controlplayback.so
 %{_libdir}/asterisk/modules/app_db.so
 %{_libdir}/asterisk/modules/app_dial.so
@@ -662,7 +621,6 @@ fi
 %{_libdir}/asterisk/modules/app_morsecode.so
 %{_libdir}/asterisk/modules/app_nbscat.so
 %{_libdir}/asterisk/modules/app_parkandannounce.so
-#%{_libdir}/asterisk/modules/app_pickupchan.so
 %{_libdir}/asterisk/modules/app_playback.so
 %{_libdir}/asterisk/modules/app_privacy.so
 %{_libdir}/asterisk/modules/app_queue.so
@@ -690,16 +648,10 @@ fi
 %{_libdir}/asterisk/modules/app_waituntil.so
 %{_libdir}/asterisk/modules/app_while.so
 %{_libdir}/asterisk/modules/app_zapateller.so
-%{_libdir}/asterisk/modules/bridge_builtin_features.so
-%{_libdir}/asterisk/modules/bridge_multiplexed.so
-%{_libdir}/asterisk/modules/bridge_simple.so
-%{_libdir}/asterisk/modules/bridge_softmix.so
 %{_libdir}/asterisk/modules/cdr_csv.so
 %{_libdir}/asterisk/modules/cdr_custom.so
 %{_libdir}/asterisk/modules/cdr_manager.so
 %{_libdir}/asterisk/modules/chan_agent.so
-%{_libdir}/asterisk/modules/chan_bridge.so
-%{_libdir}/asterisk/modules/chan_features.so
 %{_libdir}/asterisk/modules/chan_iax2.so
 %{_libdir}/asterisk/modules/chan_local.so
 %{_libdir}/asterisk/modules/chan_mgcp.so
@@ -786,6 +738,7 @@ fi
 %{_libdir}/asterisk/modules/res_speech.so
 %{_libdir}/asterisk/modules/res_timing_pthread.so
 %{_libdir}/asterisk/modules/test_dlinklists.so
+%{_libdir}/asterisk/modules/test_heap.so
 
 %{_sbindir}/aelparse
 %{_sbindir}/astcanary
@@ -793,7 +746,6 @@ fi
 %{_sbindir}/astgenkey
 %{_sbindir}/astman
 %{_sbindir}/autosupport
-%{_sbindir}/check_expr
 %{_sbindir}/conf2ael
 %{_sbindir}/muted
 %{_sbindir}/rasterisk
@@ -900,16 +852,6 @@ fi
 %doc doc/api/html/*
 %endif
 
-#%files conference
-#%defattr(-,root,root,-)
-#%doc apps/conference/CLI.txt
-#%doc apps/conference/Flags.txt
-#%doc apps/conference/LICENSE
-#%doc apps/conference/README
-#%doc apps/conference/README.videoswitch
-#%doc apps/conference/TODO
-#%{_libdir}/asterisk/modules/app_conference.so
-
 %files curl
 %defattr(-,root,root,-)
 %doc contrib/scripts/dbsep.cgi
@@ -1003,12 +945,6 @@ fi
 %config(noreplace) %{_sysconfdir}/asterisk/misdn.conf
 %{_libdir}/asterisk/modules/chan_misdn.so
 
-%files mobile
-%defattr(-,root,root,-)
-%doc doc/chan_mobile.txt
-%config(noreplace) %{_sysconfdir}/asterisk/mobile.conf
-%{_libdir}/asterisk/modules/chan_mobile.so
-
 %files odbc
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/asterisk/cdr_adaptive_odbc.conf
@@ -1101,6 +1037,10 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sun Sep  6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.6-1
+- Update to 1.6.1.6
+- Drop patches that are too troublesome to maintain anymore or have been integrated upstream.
+
 * Tue Sep  1 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.26.rc1
 - Add a patch from Quentin Armitage and rebuld.
 


Index: menuselect.makeopts
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/menuselect.makeopts,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- menuselect.makeopts	9 Feb 2009 05:54:22 -0000	1.5
+++ menuselect.makeopts	7 Sep 2009 05:43:14 -0000	1.6
@@ -1,5 +1,4 @@
 MENUSELECT_APPS=app_ivrdemo app_mp3 app_osplookup app_rpt app_skel 
-MENUSELECT_BRIDGES=bridge_zaptel
 MENUSELECT_CDR=cdr_sqlite
 MENUSELECT_CHANNELS=chan_h323 chan_nbs chan_vpb 
 MENUSELECT_CODECS=codec_ilbc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	5 Mar 2009 14:12:22 -0000	1.21
+++ sources	7 Sep 2009 05:43:14 -0000	1.22
@@ -1,3 +1,3 @@
-d77d5521c9e742c81356f49ebcf6051a  asterisk-1.6.1-rc1-stripped.tar.gz
-2ed78cc8eae3b293c5295444e891462e  asterisk-1.6.1-rc1.tar.gz.asc
-4c2feab99acb254a49048b93da97ad42  asterisk-developer-pubring.gpg
+4f57c6c9fff1bfeb9061679c123f7468  asterisk-1.6.1.6-stripped.tar.gz
+0c07f535bada3bca06d459ed3a416f22  asterisk-1.6.1.6.tar.gz.asc
+dd089905d0ba9a514359dc2cf1a53303  asterisk-developer-pubring.gpg


--- 0003-Add-chan_mobile-from-asterisk-addons.patch DELETED ---


--- 0004-Use-pkgconfig-to-check-for-Lua.patch DELETED ---


--- 0007-Define-missing-variable-when-compiling-on-PPC.patch DELETED ---


--- 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch DELETED ---


--- 0013-Bridging-work-as-of-svn-rev-174216.patch DELETED ---


--- 0014-Adding-in-CLI-apps.patch DELETED ---


--- 0015-Update-autoconf.patch DELETED ---


--- 0016-pagecount.patch DELETED ---


