OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Sep-2008 12:42:04
Branch: HEAD Handle: 2008090811420300
Modified files:
openpkg-src/asterisk asterisk.spec asterisk.txt
Log:
Zaptel was renamed to DAHDI
Summary:
Revision Changes Path
1.77 +23 -23 openpkg-src/asterisk/asterisk.spec
1.47 +3 -3 openpkg-src/asterisk/asterisk.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.76 -r1.77 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 5 Sep 2008 19:05:54 -0000
1.76
+++ openpkg-src/asterisk/asterisk.spec 8 Sep 2008 10:42:03 -0000
1.77
@@ -41,10 +41,10 @@
Group: VoIP
License: GPL
Version: %{V_opkg}
-Release: 20080905
+Release: 20080908
# package options
-%option with_zaptel no
+%option with_dahdi no
%option with_capi no
%option with_ogg no
%option with_mp3 no
@@ -180,22 +180,22 @@
%build
# sanity check
-%if "%{with_zaptel}" == "yes"
- zaptel_prefix=""
+%if "%{with_dahdi}" == "yes"
+ dahdi_prefix=""
case "%{l_platform -t}" in
*-linux* )
- if [ ! -f /usr/include/linux/zaptel.h ]; then
- echo "option \"with_zaptel\" requires Zaptel Linux drivers
installed" 1>&2; exit 1
+ if [ ! -f /usr/include/linux/dahdi.h ]; then
+ echo "option \"with_dahdi\" requires DAHDI Linux drivers
installed" 1>&2; exit 1
fi
- zaptel_prefix=/usr
+ dahdi_prefix=/usr
;;
*-freebsd* )
- if [ ! -f /usr/local/include/zaptel/zaptel.h ]; then
- echo "option \"with_zaptel\" requires Zaptel FreeBSD drivers
installed" 1>&2; exit 1
+ if [ ! -f /usr/local/include/dahdi/dahdi.h ]; then
+ echo "option \"with_dahdi\" requires DAHDI FreeBSD drivers
installed" 1>&2; exit 1
fi
- zaptel_prefix=/usr/local
+ dahdi_prefix=/usr/local
;;
- * ) echo "option \"with_zaptel\" supported under Linux and FreeBSD
only" 1>&2; exit 1 ;;
+ * ) echo "option \"with_dahdi\" supported under Linux and FreeBSD
only" 1>&2; exit 1 ;;
esac
%endif
%if "%{with_capi}" == "yes"
@@ -241,9 +241,9 @@
%if "%{with_ldap}" == "yes"
libs="$libs -lldap -llber -lssl -lcrypto"
%endif
-%if "%{with_zaptel}" == "yes"
- cppflags="$cppflags -I$zaptel_prefix/include"
- ldflags="$ldflags -L$zaptel_prefix/lib"
+%if "%{with_dahdi}" == "yes"
+ cppflags="$cppflags -I$dahdi_prefix/include"
+ ldflags="$ldflags -L$dahdi_prefix/lib"
%endif
CC="%{l_cc}" \
CFLAGS="$cflags" \
@@ -287,11 +287,11 @@
%else
--without-lua \
%endif
-%if "%{with_zaptel}" == "yes"
- --with-zaptel=$zaptel_prefix \
- --with-tonezone=$zaptel_prefix \
+%if "%{with_dahdi}" == "yes"
+ --with-dahdi=$dahdi_prefix \
+ --with-tonezone=$dahdi_prefix \
%else
- --without-zaptel \
+ --without-dahdi \
--without-tonezone \
%endif
%if "%{with_avcodec}" == "yes"
@@ -432,8 +432,8 @@
# install default configuration
for name in `grep "^<file" %{SOURCE asterisk.txt} | sed -e
's;^.*name=";;' -e 's;".*$;;'`; do
-%if "%{with_zaptel}" == "no"
- [ ".$name" = ".zapata.conf" ] && continue
+%if "%{with_dahdi}" == "no"
+ [ ".$name" = ".chan_dahdi.conf" ] && continue
%endif
%if "%{with_capi}" == "no"
[ ".$name" = ".capi.conf" ] && continue
@@ -469,15 +469,15 @@
rm -rf $RPM_BUILD_ROOT
%post
-%if "%{with_zaptel}" == "yes"
+%if "%{with_dahdi}" == "yes"
if [ $1 -eq 1 ]; then
case "%{l_platform -t}" in
*-freebsd* )
- ( echo "To allow Asterisk to use the Zaptel /dev/zap/pseudo
device(s)"
+ ( echo "To allow Asterisk to use the DAHDI /dev/dahdi/pseudo
device(s)"
echo "you have add the following entry to
/etc/devfs.rules:"
echo ""
echo "[openpkg_asterisk=10]"
- echo "add path 'zap/pseudo*' mode 0664 user %{l_rusr}
group %{l_rgrp}"
+ echo "add path 'dahdi/pseudo*' mode 0664 user %{l_rusr}
group %{l_rgrp}"
echo ""
) | %{l_rpmtool} msg -b -t notice
;;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.txt
============================================================================
$ cvs diff -u -r1.46 -r1.47 asterisk.txt
--- openpkg-src/asterisk/asterisk.txt 24 Mar 2008 20:11:27 -0000 1.46
+++ openpkg-src/asterisk/asterisk.txt 8 Sep 2008 10:42:03 -0000 1.47
@@ -569,12 +569,12 @@
genericplc = true
</file>
-<file name="zapata.conf">
+<file name="chan_dahdi.conf">
;;
-;; zapata.conf -- Asterisk Zaptel channel configuration
+;; chan_dahdi.conf -- Asterisk DAHDI channel configuration
;;
-; (an empty configuration is ok, but required even for Zaptel "ztdummy"
only)
+; (an empty configuration is ok, but required even for DAHDI "dahdidummy"
only)
[trunkgroups]
[channels]
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
