Author: oden
Date: Tue Oct 24 12:40:20 2006
New Revision: 72294
Added:
packages/cooker/asterisk/current/SOURCES/asterisk-1.4.0-beta2-imap.diff
packages/cooker/asterisk/current/SOURCES/asterisk-1.4.0-beta3-external_liblpc10_and_libilbc.diff
packages/cooker/asterisk/current/SOURCES/asterisk-1.4.0-beta3-freetds_mssql.diff
packages/cooker/asterisk/current/SOURCES/asterisk-1.4.0-beta3-no_mega_optimization.diff
Removed:
packages/cooker/asterisk/current/SOURCES/asterisk-1.1-20050529-freetds_new_api_fix.diff
packages/cooker/asterisk/current/SOURCES/asterisk-1.2.4-chan_misdn.diff
packages/cooker/asterisk/current/SOURCES/asterisk-1.2.5-freetds_mssql.diff
Modified:
packages/cooker/asterisk/current/SPECS/asterisk.spec
Log:
- dropped upstream/obsolete patches; P9,P10
- rediffed P4
- added P16,P17,P18
- enable almost all the bundled modules/drivers/features
- major deps changes, you really need the build deps from svn to be able to
build it
- did some general spec file cleansing...
Added: packages/cooker/asterisk/current/SOURCES/asterisk-1.4.0-beta2-imap.diff
==============================================================================
--- (empty file)
+++ packages/cooker/asterisk/current/SOURCES/asterisk-1.4.0-beta2-imap.diff
Tue Oct 24 12:40:20 2006
@@ -0,0 +1,28 @@
+--- configure.ac 2006-09-19 19:07:22.000000000 +0200
++++ configure.ac.oden 2006-10-24 09:14:39.000000000 +0200
+@@ -380,11 +380,9 @@
+ AC_MSG_CHECKING(for UW IMAP Toolkit c-client library)
+ saved_cppflags="${CPPFLAGS}"
+ saved_libs="${LIBS}"
+- if test -f ${IMAP_TK_DIR}/c-client/LDFLAGS ; then
+- imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
+- fi
+- CPPFLAGS="${CPPFLAGS} -I${IMAP_TK_DIR}/c-client"
+- LIBS="${LIBS} ${IMAP_TK_DIR}/c-client/c-client.a "`echo ${imap_ldflags}`
++ imap_ldflags="-lpam -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lssl
-lcrypto"
++ CPPFLAGS="${CPPFLAGS} -I${IMAP_TK_DIR}/include/imap"
++ LIBS="${LIBS} ${IMAP_TK_DIR}/lib/libc-client.a "`echo ${imap_ldflags}`
+ AC_LINK_IFELSE(
+ AC_LANG_PROGRAM(
+ [#include "c-client.h"
+@@ -501,8 +499,8 @@
+ LIBS="${saved_libs}"
+ if test "${ac_cv_imap_tk}" = "yes"; then
+ AC_MSG_RESULT(yes)
+- IMAP_TK_LIB="${IMAP_TK_DIR}/c-client/c-client.a "`echo ${imap_ldflags}`
+- IMAP_TK_INCLUDE="-I${IMAP_TK_DIR}/c-client"
++ IMAP_TK_LIB="${IMAP_TK_DIR}/lib/libc-client.a "`echo ${imap_ldflags}`
++ IMAP_TK_INCLUDE="-I${IMAP_TK_DIR}/include/imap"
+ PBX_IMAP_TK=1
+ AC_DEFINE([HAVE_IMAP_TK], 1, [Define if your system has the UW IMAP
Toolkit c-client library.])
+ if test "${ac_cv_imap_tk2006}" = "yes"; then
Added:
packages/cooker/asterisk/current/SOURCES/asterisk-1.4.0-beta3-external_liblpc10_and_libilbc.diff
==============================================================================
--- (empty file)
+++
packages/cooker/asterisk/current/SOURCES/asterisk-1.4.0-beta3-external_liblpc10_and_libilbc.diff
Tue Oct 24 12:40:20 2006
@@ -0,0 +1,33 @@
+--- codecs/Makefile 2006-09-30 00:47:40.000000000 +0200
++++ codecs/Makefile.oden 2006-10-24 09:59:36.000000000 +0200
+@@ -23,8 +23,8 @@
+ LOADABLE_MODS:=
+ endif
+
+-LIBILBC:=ilbc/libilbc.a
+-LIBLPC10:=lpc10/liblpc10.a
++LIBILBC=-lilbc
++LIBLPC10=-llpc10
+
+ all: _all
+
+@@ -37,19 +37,11 @@
+
+ clean::
+ $(MAKE) -C gsm clean
+- $(MAKE) -C lpc10 clean
+- $(MAKE) -C ilbc clean
+
+ gsm/lib/libgsm.a:
+ @mkdir -p gsm/lib
+ @$(MAKE) -C gsm lib/libgsm.a
+
+-$(LIBLPC10):
+- @$(MAKE) -C lpc10 all
+-
+ $(if $(filter codec_lpc10,$(EMBEDDED_MODS)),modules.link,codec_lpc10.so):
$(LIBLPC10)
+
+-$(LIBILBC):
+- @$(MAKE) -C ilbc all
+-
+ $(if $(filter codec_ilbc,$(EMBEDDED_MODS)),modules.link,codec_ilbc.so):
$(LIBILBC)
Added:
packages/cooker/asterisk/current/SOURCES/asterisk-1.4.0-beta3-freetds_mssql.diff
==============================================================================
--- (empty file)
+++
packages/cooker/asterisk/current/SOURCES/asterisk-1.4.0-beta3-freetds_mssql.diff
Tue Oct 24 12:40:20 2006
@@ -0,0 +1,43 @@
+diff -Naur asterisk-1.4.0-beta3/cdr/cdr_tds.c
asterisk-1.4.0-beta3.oden/cdr/cdr_tds.c
+--- asterisk-1.4.0-beta3/cdr/cdr_tds.c 2006-09-21 18:31:59.000000000 +0200
++++ asterisk-1.4.0-beta3.oden/cdr/cdr_tds.c 2006-10-24 09:51:38.000000000
+0200
+@@ -71,8 +71,8 @@
+ #include <time.h>
+ #include <math.h>
+
+-#include <tds.h>
+-#include <tdsconvert.h>
++#include <freetds_mssql/tds.h>
++#include <freetds_mssql/tdsconvert.h>
+ #include <ctype.h>
+
+ #include "asterisk/config.h"
+diff -Naur asterisk-1.4.0-beta3/configure.ac
asterisk-1.4.0-beta3.oden/configure.ac
+--- asterisk-1.4.0-beta3/configure.ac 2006-10-13 17:41:14.000000000 +0200
++++ asterisk-1.4.0-beta3.oden/configure.ac 2006-10-24 09:55:38.000000000
+0200
+@@ -180,7 +180,7 @@
+ AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite])
+ AST_EXT_LIB_SETUP([SUPPSERV], [mISDN Supplemental Services], [suppserv])
+ AST_EXT_LIB_SETUP([OPENSSL], [OpenSSL], [ssl])
+-AST_EXT_LIB_SETUP([FREETDS], [FreeTDS], [tds])
++AST_EXT_LIB_SETUP([FREETDS], [FreeTDS], [tds_mssql])
+ AST_EXT_LIB_SETUP([TERMCAP], [Termcap], [termcap])
+ AST_EXT_LIB_SETUP([TINFO], [Term Info], [tinfo])
+ AST_EXT_LIB_SETUP([TONEZONE], [tonezone], [tonezone])
+@@ -820,12 +820,12 @@
+
+ AST_EXT_LIB_CHECK([OPENSSL], [ssl], [ssl2_connect], [openssl/ssl.h],
[-lcrypto])
+
+-AST_EXT_LIB_CHECK([FREETDS], [tds], [tds_version], [tds.h])
++AST_EXT_LIB_CHECK([FREETDS], [tds_mssql], [tds_version],
[freetds_mssql/tds.h])
+ if test "${PBX_FREETDS}" != "0";
+ then
+- case `grep TDS_VERSION_NO ${FREETDS_DIR:-/usr/include}/tdsver.h` in
+- *0.64*)
+- FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64"
++ case `grep TDS_VERSION_NO
${FREETDS_DIR:-/usr}/include/freetds_mssql/tdsver.h` in
++ *0.64*)
++ FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64"
+ ;;
+ *0.63*)
+ FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_63"
Added:
packages/cooker/asterisk/current/SOURCES/asterisk-1.4.0-beta3-no_mega_optimization.diff
==============================================================================
--- (empty file)
+++
packages/cooker/asterisk/current/SOURCES/asterisk-1.4.0-beta3-no_mega_optimization.diff
Tue Oct 24 12:40:20 2006
@@ -0,0 +1,11 @@
+--- Makefile.rules 2006-10-24 10:00:23.000000000 +0200
++++ Makefile.rules.oden 2006-10-24 10:00:47.000000000 +0200
+@@ -32,7 +32,7 @@
+ # ppro's, etc, as well as the AMD K6 and K7.
+ #K6OPT=-DK6OPT
+
+-OPTIMIZE?=-O6
++OPTIMIZE?=
+ ASTCFLAGS+=$(OPTIMIZE)
+ endif
+
Modified: packages/cooker/asterisk/current/SPECS/asterisk.spec
==============================================================================
--- packages/cooker/asterisk/current/SPECS/asterisk.spec (original)
+++ packages/cooker/asterisk/current/SPECS/asterisk.spec Tue Oct 24
12:40:20 2006
@@ -1,10 +1,10 @@
%define version 1.4.0
%define beta_ver beta3
-%define release %mkrel 0.2.%{beta_ver}
+%define release %mkrel 0.3.%{beta_ver}
%define _requires_exceptions perl(Carp::Heavy)
-%define build_misdn 0
+%define build_misdn 1
%{?_without_misdn: %global build_misdn 0}
%{?_with_misdn: %global build_misdn 1}
@@ -16,13 +16,18 @@
%{?_without_radius: %global build_radius 0}
%{?_with_radius: %global build_radius 1}
+%define build_tds 1
+%{?_without_tds: %global build_tds 0}
+%{?_with_tds: %global build_tds 1}
+
%define build_tcp 1
%{?_without_tcp: %global build_tcp 0}
%{?_with_tcp: %global build_tcp 1}
-%define build_tds 0
-%{?_without_tds: %global build_tds 0}
-%{?_with_tds: %global build_tds 1}
+# this takes quite some time...
+%define build_docs 0
+%{?_without_docs: %global build_docs 0}
+%{?_with_docs: %global build_docs 1}
Summary: Asterisk PBX
Name: asterisk
@@ -39,26 +44,29 @@
Patch1: asterisk-1.2.4-spandsp.diff
Patch2: asterisk-1.2.0-beta1-antibork_1.diff
Patch3: asterisk-1.2.5-antibork_2.diff
-Patch4: asterisk-1.2.5-freetds_mssql.diff
+Patch4: asterisk-1.4.0-beta3-freetds_mssql.diff
Patch5: asterisk-1.0.8-20050420-freetds-0.63.diff
Patch8: asterisk-1.0.8-20050420-h323_conf_fix.diff
-Patch9: asterisk-1.1-20050529-freetds_new_api_fix.diff
-Patch10: asterisk-1.2.4-chan_misdn.diff
# taken from the visdn-devel-20060315 tar ball
Patch11: asterisk-1.2.5-cap.diff
Patch12: asterisk-1.2-answer.diff
Patch13: asterisk-1.2-disconnect.diff
Patch14: asterisk-1.2.7.1-ppcfix.diff.bz2
Patch15: asterisk-1.2.7.1-metermaid.diff
-#Patch100: asterisk-20060912c-tcp.patch
+Patch16: asterisk-1.4.0-beta3-external_liblpc10_and_libilbc.diff
+Patch17: asterisk-1.4.0-beta3-no_mega_optimization.diff
+Patch18: asterisk-1.4.0-beta2-imap.diff
Patch100: asterisk-20061019-tcp.patch
+Requires(pre): rpm-helper
+Requires(postun): rpm-helper
Requires(post): rpm-helper
Requires(preun): rpm-helper
Requires: mpg123
-BuildRequires: alsa-lib-devel
-#BuildRequires: bison
-BuildRequires: curl-devel
-BuildRequires: doxygen
+BuildRequires: libtool
+BuildRequires: autoconf >= 1:2.60
+BuildRequires: automake1.9 >= 1.9.6
+BuildRequires: libalsa-devel
+BuildRequires: libcurl-devel
#BuildRequires: gtk+1.2-devel
BuildRequires: isdn4k-utils-devel
BuildRequires: libgsm-devel
@@ -74,16 +82,25 @@
BuildRequires: libtonezone-devel >= 1.4.0
BuildRequires: libzap-devel >= 1.0.1
BuildRequires: lpc10-devel
+BuildRequires: libidn-devel
+BuildRequires: oggvorbis-devel
+BuildRequires: openssl-devel
+BuildRequires: postgresql-devel
+BuildRequires: sqlite-devel
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: imap-devel
%if %{build_misdn}
-BuildRequires: libmisdn-devel >= 1:3.0
+BuildRequires: libmisdn-devel >= 1:3.4
+%endif
+%if %{build_docs}
+BuildRequires: doxygen
%endif
BuildRequires: newt-devel
BuildRequires: oggvorbis-devel
#BuildRequires: openh323-devel >= 1.15.3
-BuildRequires: osp-devel
## needed for smsq: popt-devel
-BuildRequires: popt-devel
-BuildRequires: sqlite-devel
+BuildRequires: libpopt-devel
#BuildRequires: swig-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -203,8 +220,7 @@
Group: System/Servers
Requires(post): %{name} = %{version}
Requires(preun): %{name} = %{version}
-#BuildRequires: freetds_mssql-devel >= 0.63
-BuildRequires: freetds-devel
+BuildRequires: freetds_mssql-devel >= 0.64
%description plugins-tds
This package contains FreeTDS plugins for Asterisk:
@@ -212,6 +228,49 @@
* Call Detail Recording for FreeTDS
%endif
+%package plugins-osp
+Summary: Open Settlement Protocol for Asterisk
+Group: System/Servers
+BuildRequires: libosp-devel
+Requires(post): %{name} = %{version}
+Requires(preun): %{name} = %{version}
+
+%description plugins-osp
+This package contains OSP (Open Settlement Protocol) support for Asterisk
+
+%package plugins-snmp
+Summary: Brief SNMP Agent / SubAgent support for Asterisk
+Group: System/Servers
+Requires: net-snmp
+BuildRequires: libnet-snmp-devel
+BuildRequires: tcp_wrappers-devel
+BuildRequires: openssl-devel
+Requires(post): %{name} = %{version}
+Requires(preun): %{name} = %{version}
+
+%description plugins-snmp
+This package contains brief SNMP Agent / SubAgent support for Asterisk.
+
+%package plugins-jabber
+Summary: Jabber support for Asterisk
+Group: System/Servers
+BuildRequires: libgcrypt-devel
+BuildRequires: libgnutls-devel
+BuildRequires: libgpg-error-devel
+BuildRequires: libiksemel-devel
+BuildRequires: zlib-devel
+Requires(post): %{name} = %{version}
+Requires(preun): %{name} = %{version}
+
+%description plugins-jabber
+This package contains Jabber support for Asterisk.
+
+* res_jabber - A resource for interfacing asterisk directly as a client or a
+ component to a jabber compliant server.
+
+* chan_gtalk - brief Gtalk Channel Driver, until google/libjingle works with
+ jingle spec.
+
%package webvmail
Summary: Web frontend to voicemail
Group: System/Servers
@@ -242,13 +301,9 @@
#patch1 -p1 -b .spandsp
#patch2 -p1 -b .antibork_1
#patch3 -p0 -b .antibork_2
-#patch4 -p1 -b .freetds_mssql
+%patch4 -p1 -b .freetds_mssql
#patch5 -p0 -b .freetds-0.63
#patch8 -p0 -b .h323_conf_fix
-#patch9 -p0 -b .freetds_new_api_fix
-#if %{build_misdn}
-#patch10 -p1 -b .chan_misdn
-#endif
# visdn
#%patch11 -p1 -b .cap
#patch12 -p1 -b .answer
@@ -257,15 +312,21 @@
#patch14 -p1 -b .ppcfix
%endif
#patch15 -p0 -b .metermaid
+%patch16 -p0 -b .external_liblpc10_and_libilbc
+%patch17 -p0 -b .no_mega_optimization
+%patch18 -p0 -b .imap
+
%if %{build_tcp}
# SIP over TCP
%patch100 -p0 -b .tcp.patch
%endif
+
bzcat %{SOURCE1} > asterisk.init
bzcat %{SOURCE2} > asterisk.sysconfig
# lib64 fix
find -name "Makefile" | xargs perl -pi -e "s|/usr/lib|%{_libdir}|g"
+perl -pi -e "s|/lib\b|/%{_lib}|g" configure*
# fix one convenient softlink
pushd docs-html
@@ -276,65 +337,63 @@
rm -f sounds/conf-hasleft.gsm sounds/conf-thereare.gsm
%build
+rm -f configure
+sh ./bootstrap.sh
echo "%{version}-%{release}" > .version
-%configure \
- --with-gsm \
+export ASTCFLAGS="%{optflags}"
+
+%configure2_5x \
+ --without-kde \
+ --without-qt \
+ --without-tinfo \
+ --without-vpb \
+ --without-pwlib \
+ --without-h323 \
+ --with-imap=%{_prefix} \
+ --with-asound=%{_prefix} \
+ --with-curses=%{_prefix} \
+ --with-gnutls=%{_prefix} \
+ --with-gsm=%{_prefix} \
+ --with-iksemel=%{_prefix} \
+ --with-isdnnet=%{_prefix} \
%if %{build_misdn}
- --with-misdn \
+ --with-misdn=%{_prefix} \
%endif
+ --with-nbs=%{_prefix} \
+ --with-ncurses=%{_prefix} \
+ --with-netsnmp=%{_prefix} \
+ --with-newt=%{_prefix} \
%if %{build_odbc}
- --with-odbc \
+ --with-odbc=%{_prefix} \
%endif
- --with-postgres \
-%if %build_tds
- --with-tds \
-%endif
- --with-zaptel \
- HTTPDIR="/var/www"
+ --with-ogg=%{_prefix} \
+ --with-osptk=%{_prefix} \
+ --with-oss=%{_prefix} \
+ --with-popt=%{_prefix} \
+ --with-postgres=%{_prefix} \
+ --with-pri=%{_prefix} \
+ --with-radius=%{_prefix} \
+ --with-speex=%{_prefix} \
+ --with-sqlite=%{_prefix} \
+ --with-suppserv=%{_prefix} \
+ --with-ssl=%{_prefix} \
+%if %{build_tds}
+ --with-tds_mssql=%{_prefix} \
+%endif
+ --with-termcap=%{_prefix} \
+ --with-tonezone=%{_prefix} \
+ --with-vorbis=%{_prefix} \
+ --with-z=%{_prefix} \
+ --with-zaptel=%{_prefix} \
+ HTTPDIR="/var/www"
%make
-#export HOST_CC=gcc
-#make -C channels busy.h
-#make -C channels ringtone.h
-#make \
-# OPTIMIZE="%{optflags} -pipe -Wall -fPIC -DPIC -D_REENTRANT
-D_GNU_SOURCE" \
-# AGI_DIR=%{_localstatedir}/asterisk/agi-bin \
-# ASTBINDIR=%{_bindir} \
-# ASTETCDIR=%{_sysconfdir}/asterisk \
-# ASTHEADERDIR=%{_includedir}/asterisk \
-# ASTLIBDIR=%{_libdir} \
-# ASTLOGDIR=/var/log/asterisk \
-# ASTMANDIR=%{_mandir} \
-# ASTSBINDIR=%{_sbindir} \
-# ASTSPOOLDIR=/var/spool/asterisk \
-# ASTVARLIBDIR=%{_localstatedir}/asterisk \
-# ASTVARRUNDIR=/var/run/asterisk \
-# DEBUG="" \
-# MODULES_DIR=%{_libdir}/asterisk \
-# ZAPDIR=%{_libdir}
-
-# make the muted binary
-#make \
-# AGI_DIR=%{_localstatedir}/asterisk/agi-bin \
-# ASTBINDIR=%{_bindir} \
-# ASTETCDIR=%{_sysconfdir}/asterisk \
-# ASTHEADERDIR=%{_includedir}/asterisk \
-# ASTLIBDIR=%{_libdir} \
-# ASTLOGDIR=/var/log/asterisk \
-# ASTMANDIR=%{_mandir} \
-# ASTSBINDIR=%{_sbindir} \
-# ASTSPOOLDIR=/var/spool/asterisk \
-# ASTVARLIBDIR=%{_localstatedir}/asterisk \
-# ASTVARRUNDIR=/var/run/asterisk \
-# DEBUG="" \
-# MODULES_DIR=%{_libdir}/asterisk \
-# ZAPDIR=%{_libdir} \
-# OPTIMIZE="%{optflags} -pipe -Wall -fPIC -DPIC -D_REENTRANT
-D_GNU_SOURCE" \
-# muted
+%if %{build_docs}
%make progdocs
+%endif
%install
[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
@@ -348,44 +407,9 @@
# don't fiddle with the initscript!
export DONT_GPRINTIFY=1
-#install -d %{buildroot}%{_libdir}/pkgconfig
-#install -d %{buildroot}/var/log/asterisk/cdr-csv
-#install -d %{buildroot}/var/log/asterisk/cdr-custom
-#install -d %{buildroot}/var/log/asterisk/testreports
-#
install -d %{buildroot}/var/run/asterisk
-#
install -d %{buildroot}/var/spool/asterisk
-#install -d %{buildroot}/var/spool/asterisk/dictate
-#install -d %{buildroot}/var/spool/asterisk/meetme
-#install -d %{buildroot}/var/spool/asterisk/monitor
install -d %{buildroot}/var/spool/asterisk/outgoing
-#install -d %{buildroot}/var/spool/asterisk/system
-#install -d %{buildroot}/var/spool/asterisk/tmp
-#
-
-#make \
-# DESTDIR="%{buildroot}" \
-# ASTLIBDIR=%{_libdir} \
-# AGI_DIR=%{_localstatedir}/asterisk/agi-bin \
-# MODULES_DIR=%{_libdir}/asterisk \
-# ASTVARLIBDIR=%{_localstatedir}/asterisk \
-# ASTETCDIR=%{_sysconfdir}/asterisk \
-# ASTSPOOLDIR=/var/spool/asterisk \
-# ASTLOGDIR=/var/log/asterisk \
-# ASTHEADERDIR=%{_includedir}/asterisk \
-# ASTBINDIR=%{_bindir} \
-# ASTSBINDIR=%{_sbindir} \
-# ASTVARRUNDIR=/var/run/asterisk \
-# ASTMANDIR=%{_mandir} \
-# HTTPDIR="/var/www" \
-# install
-
-# fix broken softlinks
-#ln -snf voicemail/default %{buildroot}/var/spool/asterisk/vm
-#ln -snf ../../../spool/asterisk/vm
%{buildroot}%{_localstatedir}/asterisk/sounds
-#ln -snf ../../../spool/asterisk/voicemail
%{buildroot}%{_localstatedir}/asterisk/sounds/voicemail
-#ln -snf ../../../spool/asterisk/voicemail
%{buildroot}/var/spool/asterisk/voicemail
# install init scrips
install -d %{buildroot}%{_initrddir}
@@ -395,15 +419,6 @@
install -d %{buildroot}%{_sysconfdir}/sysconfig
install -m0644 asterisk.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/asterisk
-# install missing h323 config file
-#install -m0644 channels/h323/h323.conf.sample
%{buildroot}%{_sysconfdir}/asterisk/h323.conf
-
-# fix config files
-#perl -pi -e "s|%{buildroot}||g" %{buildroot}%{_sysconfdir}/asterisk/*
-
-# fix two naughty bugs
-#perl -pi -e "s|/usr/local|/usr|g"
%{buildroot}%{_libdir}/asterisk/perl/WebServer.pm
-
# fix logrotation
install -d %{buildroot}%{_sysconfdir}/logrotate.d
cat > %{buildroot}%{_sysconfdir}/logrotate.d/asterisk << EOF
@@ -420,65 +435,10 @@
}
EOF
-# install the muted stuff
-#install -m0755 muted %{buildroot}%{_sbindir}/
-#install -m0644 muted.conf.sample %{buildroot}%{_sysconfdir}/muted.conf
-
-#cat > README.MDK << EOF
-#T O D O
-#-------
-
-#* ?
-
-
-#E R R A T A
-#-----------
-
-#The MOH (music on hold) and in several other places of the sourcecode
-#(app_meetme.c, app_zapbarge.c,app_zapscan.c,chan_iax2.c,chan_zap.c,
-#res_musiconhold.c,zaptel.c,ztmonitor.c,zttest.c) a /dev/zap/pseudo
-#device is needed. This device is vendor specific. The source lacks
-#ifdefs in many places that would enable usage of another device.
-
-#The MOH feature requires a timing device, and currently the
-#/dev/zap/pseudo device is used for that also (or the ztdummy.c kernel
-#module from the zaptel kernel module source).
-
-#There is another timing device (actually a kernel module) named zaprtc
-#found at http://www.junghanns.net/ but it seems it will clash with dual
-#CPU systems (HT, etc.) because of the internal kernel use of the
-#vanilla rtc kernel module.
-
-#For fresh information about this please visit this resource:
-#http://www.voip-info.org/wiki-Asterisk+Timer
-
-#Asterisk is not a plug and play software. The learning curve is pretty
-#steep. You have a head start if you allready are working within the
-#telecom business and know each protocol spec by heart.
-
-#R E F L E C T I O N S
-#---------------------
-
-#I would say this software is pretty much locked to one vendor at this
-#point. So if you don't go and buy hardware from the author, you will
-#experience problems...
-
-#Regards // Oden Eriksson
-#EOF
-
-# install extra (forgotten?) headers
-#install -m0644 *.h %{buildroot}%{_includedir}/asterisk/
-#install -m0644 include/*.h %{buildroot}%{_includedir}/asterisk/
-#install -m0644 include/asterisk/*.h %{buildroot}%{_includedir}/asterisk/
-
-# just doing %%doc doc/api/html/* will make rpm barf...
-#install -d %{buildroot}%{_docdir}/%{name}-devel-%{version}
-#for i in doc/api/html/*; do
-# install -m0644 $i %{buildroot}%{_docdir}/%{name}-devel-%{version}/
-#done
-
-# multiarch policy
-#multiarch_includes %{buildroot}%{_includedir}/asterisk/defaults.h
+touch %{name}-devel.filelist
+%if %{build_docs}
+ find doc/api/html -type f | sed 's/^/%doc /' | grep -v
'\./%{name}-devel.filelist' > %{name}-devel.filelist
+%endif
# fix ghost files
touch %{buildroot}%{_localstatedir}/asterisk/astdb
@@ -492,6 +452,8 @@
# Fix incorrect path in /etc/asterisk/asterisk.conf
perl -pi -e "s|astrundir => /var/run|astrundir => /var/run/asterisk|g"
%{buildroot}/%{_sysconfdir}/asterisk/asterisk.conf
+perl -pi -e "s|^libdir=.*|libdir=%{_libdir}|g"
%{buildroot}%{_libdir}/pkgconfig/asterisk.pc
+perl -pi -e "s|^varrundir=.*|varrundir=/var/run/asterisk|g"
%{buildroot}%{_libdir}/pkgconfig/asterisk.pc
# Remove unpackages files
rm -rf \
@@ -538,19 +500,24 @@
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/asterisk/*.adsi
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/asterisk/*.conf
%attr(0644,root,root) %config(noreplace)
%{_sysconfdir}/sysconfig/asterisk
+
+# these are packaged as sub packages below
+%attr(0644,root,root) %config(noreplace)
%{_sysconfdir}/asterisk/extensions.ael
+%if %{build_misdn}
+%exclude
%{_sysconfdir}/asterisk/misdn.conf
+%endif
%if %{build_odbc}
%exclude
%{_sysconfdir}/asterisk/*_odbc.conf
%endif
-%exclude
%{_sysconfdir}/asterisk/*sql*.conf
-%if %build_tds
+%if %{build_tds}
%exclude
%{_sysconfdir}/asterisk/*tds*.conf
%endif
%exclude
%{_sysconfdir}/asterisk/cdr_pgsql.conf
-%attr(0644,root,root) %config(noreplace)
%{_sysconfdir}/asterisk/extensions.ael
-%if %{build_misdn}
-%exclude
%{_sysconfdir}/asterisk/misdn.conf
-%endif
-#attr(0644,root,root) %config(noreplace) %{_sysconfdir}/muted.conf
+%exclude
%{_sysconfdir}/asterisk/gtalk.conf
+%exclude
%{_sysconfdir}/asterisk/jabber.conf
+%exclude %{_sysconfdir}/asterisk/osp.conf
+%exclude
%{_sysconfdir}/asterisk/res_snmp.conf
+%exclude
%{_sysconfdir}/asterisk/*sql*.conf
%attr(0755,root,root) %{_sbindir}/aelparse
%attr(0755,root,root) %{_sbindir}/asterisk
@@ -565,16 +532,8 @@
%attr(0755,root,root) %{_sbindir}/streamplayer
%attr(0755,root,root)
%{_libdir}/asterisk/modules/app_*.so
-#exclude
%{_libdir}/asterisk/modules/app_*fax.so
-#exclude
%{_libdir}/asterisk/modules/app_sql_postgres.so
%attr(0755,root,root)
%{_libdir}/asterisk/modules/cdr_*.so
-%exclude
%{_libdir}/asterisk/modules/cdr_pgsql.so
-%exclude
%{_libdir}/asterisk/modules/cdr_radius.so
-%exclude
%{_libdir}/asterisk/modules/cdr_sqlite.so
%attr(0755,root,root)
%{_libdir}/asterisk/modules/chan_*.so
-%if %{build_misdn}
-#exclude
%{_libdir}/asterisk/modules/chan_misdn.so
-%endif
%attr(0755,root,root)
%{_libdir}/asterisk/modules/codec_*.so
%attr(0755,root,root)
%{_libdir}/asterisk/modules/format_*.so
%attr(0755,root,root)
%{_libdir}/asterisk/modules/func_*.so
@@ -583,14 +542,28 @@
#attr(0755,root,root)
%{_libdir}/asterisk/modules/func_uri.so
%attr(0755,root,root)
%{_libdir}/asterisk/modules/pbx_*.so
%attr(0755,root,root)
%{_libdir}/asterisk/modules/res_*.so
-%exclude
%{_libdir}/asterisk/modules/res_config_pgsql.so
-%exclude
%{_libdir}/asterisk/modules/*sql*.so
+
+# these are packaged as sub packages below
+%if %{build_misdn}
+%exclude
%{_libdir}/asterisk/modules/chan_misdn.so
+%endif
%if %{build_odbc}
%exclude
%{_libdir}/asterisk/modules/*_odbc.so
%endif
-%if %build_tds
+%if %{build_tds}
%exclude
%{_libdir}/asterisk/modules/*tds*.so
%endif
+#exclude
%{_libdir}/asterisk/modules/app_*fax.so
+%exclude
%{_libdir}/asterisk/modules/app_osplookup.so
+#exclude
%{_libdir}/asterisk/modules/app_sql_postgres.so
+%exclude
%{_libdir}/asterisk/modules/cdr_pgsql.so
+%exclude
%{_libdir}/asterisk/modules/cdr_radius.so
+%exclude
%{_libdir}/asterisk/modules/cdr_sqlite.so
+%exclude
%{_libdir}/asterisk/modules/chan_gtalk.so
+%exclude
%{_libdir}/asterisk/modules/res_config_pgsql.so
+%exclude
%{_libdir}/asterisk/modules/res_jabber.so
+%exclude
%{_libdir}/asterisk/modules/res_snmp.so
+%exclude
%{_libdir}/asterisk/modules/*sql*.so
#attr(0755,asterisk,asterisk) %dir %{_localstatedir}/asterisk
%attr(0755,root,root) %dir
%{_localstatedir}/asterisk/agi-bin
@@ -658,20 +631,12 @@
#attr(0750,asterisk,asterisk) %dir
/var/spool/asterisk/voicemail/voicemail
%{_mandir}/man8/asterisk.8*
- %{_mandir}/man8/astgenkey.8.bz2
-
%{_mandir}/man8/autosupport.8.bz2
-
%{_mandir}/man8/safe_asterisk.8.bz2
-
-%if %{build_misdn}
-%files chan_misdn
-%defattr(-,root,root)
-%attr(0644,root,root) %config(noreplace)
%{_sysconfdir}/asterisk/misdn.conf
-#attr(0755,root,root)
%{_libdir}/asterisk/modules/chan_misdn.so
-%endif
+ %{_mandir}/man8/astgenkey.8*
+ %{_mandir}/man8/autosupport.8*
+ %{_mandir}/man8/safe_asterisk.8*
-%files devel
+%files devel -f %{name}-devel.filelist
%defattr(-,root,root)
-#{_docdir}/%{name}-devel-%{version}/*
%attr(0644,root,root) %{_includedir}/asterisk/*.h
%attr(0644,root,root) %{_includedir}/asterisk.h
#exclude
%{_includedir}/asterisk/defaults.h
@@ -682,6 +647,13 @@
%defattr(-,root,root)
%doc docs-html/*
+%if %{build_misdn}
+%files chan_misdn
+%defattr(-,root,root)
+%attr(0644,root,root) %config(noreplace)
%{_sysconfdir}/asterisk/misdn.conf
+%attr(0755,root,root)
%{_libdir}/asterisk/modules/chan_misdn.so
+%endif
+
%files plugins-fax
%defattr(-,root,root)
#attr(0755,root,root)
%{_libdir}/asterisk/modules/app_*fax.so
@@ -717,9 +689,27 @@
%attr(0755,root,root)
%{_libdir}/asterisk/modules/cdr_tds.so
%endif
+%files plugins-osp
+%defattr(-,root,root)
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/asterisk/osp.conf
+%attr(0755,root,root)
%{_libdir}/asterisk/modules/app_osplookup.so
+
+%files plugins-snmp
+%defattr(-,root,root)
+%attr(0644,root,root) %config(noreplace)
%{_sysconfdir}/asterisk/res_snmp.conf
+%attr(0755,root,root)
%{_libdir}/asterisk/modules/res_snmp.so
+
+%files plugins-jabber
+%defattr(-,root,root)
+%attr(0644,root,root) %config(noreplace)
%{_sysconfdir}/asterisk/gtalk.conf
+%attr(0644,root,root) %config(noreplace)
%{_sysconfdir}/asterisk/jabber.conf
+%attr(0755,root,root)
%{_libdir}/asterisk/modules/chan_gtalk.so
+%attr(0755,root,root)
%{_libdir}/asterisk/modules/res_jabber.so
+
%files webvmail
%defattr(-,root,root)
%attr(4755,root,root) /var/www/cgi-bin/vmail.cgi
%attr(-,root,root) %dir /var/www/html/_asterisk
%attr(0644,root,root)
/var/www/html/_asterisk/animlogo.gif
%attr(0644,root,root) /var/www/html/_asterisk/play.gif
+
