packages (ASTERISK_1_6_1): asterisk/asterisk.spec - up to 1.6.1.20, merges ...

[glen]

Author: glen                         Date: Thu Sep 16 14:48:04 2010 GMT
Module: packages                      Tag: ASTERISK_1_6_1
---- Log message:
- up to 1.6.1.20, merges from HEAD

---- Files affected:
packages/asterisk:
   asterisk.spec (1.161 -> 1.161.2.1) 

---- Diffs:

================================================================
Index: packages/asterisk/asterisk.spec
diff -u packages/asterisk/asterisk.spec:1.161 packages/asterisk/asterisk.spec:1.161.2.1
--- packages/asterisk/asterisk.spec:1.161	Thu Jan  7 15:49:59 2010
+++ packages/asterisk/asterisk.spec	Thu Sep 16 16:47:59 2010
@@ -4,7 +4,6 @@
 # - use shared versions of LIBILBC:=ilbc/libilbc.a (ilbc not enabled currently)
 # - CFLAGS passing
 # - fix bluetooth patch
-# - ~/.asterisk_history gets encoded with \xxx on exit, each time yet again
 # - make package for moh sound files
 # - likely odbc and imap broken:
 #   *** WARNING: identical binaries are copied, not linked:
@@ -32,16 +31,16 @@
 %bcond_without	verbose		# verbose build
 
 %define		spandsp_version 0.0.2pre26
-%define		rel	0.44
+%define		rel		0.1
 Summary:	Asterisk PBX
 Summary(pl.UTF-8):	Centralka (PBX) Asterisk
 Name:		asterisk
-Version:	1.6.1.12
+Version:	1.6.1.20
 Release:	%{rel}%{?with_bristuff:.bristuff}
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	d6bc1448b8fa274a2acaef1b15f4d485
+# Source0-md5:	7295e6a34bb2e26985ef02608347f5f3
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source5:	%{name}.logrotate
@@ -69,6 +68,7 @@
 Patch15:	%{name}-bristuff-libpri.patch
 Patch16:	lpc10-system.patch
 Patch17:	gsm-libpoison.patch
+Patch18:	Fix-history-loading-when-using-external-libedit.patch
 URL:		http://www.asterisk.org/
 BuildRequires:	OSPToolkit-devel
 BuildRequires:	SDL_image-devel
@@ -84,6 +84,7 @@
 BuildRequires:	gawk
 BuildRequires:	gcc >= 5:3.4
 BuildRequires:	gmime22-devel
+BuildRequires:	gtk+2-devel
 BuildRequires:	iksemel-devel
 BuildRequires:	imap-devel
 BuildRequires:	jack-audio-connection-kit-devel
@@ -93,6 +94,7 @@
 BuildRequires:	libogg-devel
 BuildRequires:	libresample-devel
 BuildRequires:	libvorbis-devel
+BuildRequires:	libxml2-devel
 BuildRequires:	lpc10-devel
 BuildRequires:	lua51-devel
 BuildRequires:	mISDNuser-devel
@@ -181,13 +183,6 @@
 %description devel -l pl.UTF-8
 Pliki nagłówkowe platformy programistycznej Asterisk.
 
-%package apidocs
-Summary:	API documentation for Asterisk
-Group:		Documentation
-
-%description apidocs
-API documentation for Asterisk.
-
 %package ais
 Summary:	Modules for Asterisk that use OpenAIS
 Group:		Applications/Networking
@@ -520,6 +515,14 @@
 %description vorbis
 Ogg Vorbis format support.
 
+# define apidocs as last package, as it is the biggest one
+%package apidocs
+Summary:	API documentation for Asterisk
+Group:		Documentation
+
+%description apidocs
+API documentation for Asterisk.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -550,6 +553,7 @@
 %endif
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 # Fixup makefile so sound archives aren't downloaded/installed
 %{__sed} -i -e 's/^all:.*$/all:/' sounds/Makefile
@@ -749,6 +753,9 @@
 find doc/api/html -name '*.map' -size 0 -delete
 %endif
 
+rm $RPM_BUILD_ROOT%{_datadir}/asterisk/documentation/appdocsxml.dtd
+rm $RPM_BUILD_ROOT%{_datadir}/asterisk/documentation/core-en_US.xml
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -762,12 +769,6 @@
 	%groupremove asterisk
 fi
 
-%pre dahdi
-/usr/sbin/usermod -a -G dahdi asterisk
-
-%pre misdn
-/usr/sbin/usermod -a -G misdn asterisk
-
 %post
 /sbin/chkconfig --add asterisk
 # use -n (NOOP) as restart would be breaking all current calls.
@@ -1280,6 +1281,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.161.2.1  2010/09/16 14:47:59  glen
+- up to 1.6.1.20, merges from HEAD
+
 Revision 1.161  2010/01/07 14:49:59  glen
 - write licenses to /var/lib/licenses, keep symlink in datadir
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/asterisk.spec?r1=1.161&r2=1.161.2.1&f=u