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: 20-Mar-2008 20:21:17
Branch: HEAD Handle: 2008032019211600
Modified files:
openpkg-src/asterisk asterisk.patch asterisk.spec
Log:
libiax is now packaged in asterisk-libiax
Summary:
Revision Changes Path
1.33 +0 -47 openpkg-src/asterisk/asterisk.patch
1.56 +5 -29 openpkg-src/asterisk/asterisk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.32 -r1.33 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 19 Mar 2008 20:18:27 -0000
1.32
+++ openpkg-src/asterisk/asterisk.patch 20 Mar 2008 19:21:16 -0000
1.33
@@ -100,53 +100,6 @@
*)
ac_default_prefix=/usr
if test ${sysconfdir} = '${prefix}/etc'; then
-Index: iax-0.2.2/src/Makefile.in
---- iax-0.2.2/src/Makefile.in.orig 2001-11-13 18:45:14 +0100
-+++ iax-0.2.2/src/Makefile.in 2008-03-18 22:06:58 +0100
-@@ -71,7 +71,7 @@
- PACKAGE = @PACKAGE@
- RANLIB = @RANLIB@
- VERSION = @VERSION@
--CFLAGS = -g -Wall -Wstrict-prototypes -I . -DDEBUG_SUPPORT -DDEBUG_DEFAULT
$(UCFLAGS)
-+CFLAGS = -I . -DDEBUG_SUPPORT -DDEBUG_DEFAULT $(UCFLAGS)
-
- pkgdir = $(libdir)
- pkg_LTLIBRARIES = libiax.la
-@@ -304,12 +304,11 @@
-
-
- install:
-- mkdir -p $(includedir)/iax
-- install -m 644 md5.h $(includedir)/iax
-- install -m 644 frame.h $(includedir)/iax
-- install -m 644 iax.h $(includedir)/iax
-- install -m 644 iax-client.h $(includedir)/iax
-- /sbin/ldconfig
-+ mkdir -p $(DESTDIR)$(includedir)/iax
-+ install -m 644 md5.h $(DESTDIR)$(includedir)/iax
-+ install -m 644 frame.h $(DESTDIR)$(includedir)/iax
-+ install -m 644 iax.h $(DESTDIR)$(includedir)/iax
-+ install -m 644 iax-client.h $(DESTDIR)$(includedir)/iax
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: iax-0.2.2/src/iax.c
---- iax-0.2.2/src/iax.c.orig 2001-11-07 00:10:41 +0100
-+++ iax-0.2.2/src/iax.c 2008-03-18 22:06:58 +0100
-@@ -33,13 +33,11 @@
- #include <sys/time.h>
- #include <stdlib.h>
- #include <string.h>
--#include <malloc.h>
- #include <stdarg.h>
- #include <stdio.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <errno.h>
--#include <error.h>
- #include <sys/select.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
Index: main/Makefile
--- main/Makefile.orig 2008-02-28 01:11:31 +0100
+++ main/Makefile 2008-03-18 22:06:58 +0100
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.55 -r1.56 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 20 Mar 2008 19:07:33 -0000
1.55
+++ openpkg-src/asterisk/asterisk.spec 20 Mar 2008 19:21:16 -0000
1.56
@@ -27,7 +27,6 @@
%define V_asterisk_addons 1.6.0-beta2
%define V_asterisk_sounds_core 1.4.10
%define V_asterisk_sounds_extra 1.4.7
-%define V_asterisk_libiax 0.2.2
%define V_asterisk_perl 0.10
%define V_chan_capi 1_6_1
@@ -63,17 +62,16 @@
Source1:
http://downloads.digium.com/pub/asterisk/releases/asterisk-addons-%{V_asterisk_addons}.tar.gz
Source2:
http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-%{V_asterisk_sounds_core}.tar.gz
Source3:
http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-%{V_asterisk_sounds_extra}.tar.gz
-Source4:
http://downloads.digium.com/pub/libiax/iax-%{V_asterisk_libiax}.tar.gz
-Source5:
http://asterisk.gnuinter.net/files/asterisk-perl-%{V_asterisk_perl}.tar.gz
-Source6:
http://www.turbocat.net/~hselasky/capi4pbx/releases/chan_capi_%{V_chan_capi}.tar.bz2
-Source7: asterisk.txt
-Source8: rc.asterisk
+Source4:
http://asterisk.gnuinter.net/files/asterisk-perl-%{V_asterisk_perl}.tar.gz
+Source5:
http://www.turbocat.net/~hselasky/capi4pbx/releases/chan_capi_%{V_chan_capi}.tar.bz2
+Source6: asterisk.txt
+Source7: rc.asterisk
Patch0: asterisk.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, bison, gcc, make, grep, config
+BuildPreReq: OpenPKG, openpkg >= 20040130, bison, gcc, make, grep
PreReq: OpenPKG, openpkg >= 20040130
BuildPreReq: zlib, curl, openssl, ncurses, speex, popt
PreReq: zlib, curl, openssl, ncurses, speex, popt
@@ -158,11 +156,6 @@
url =
http://downloads.digium.com/pub/telephony/sounds/releases/
regex = asterisk-extra-sounds-en-alaw-(\d+\.\d+(\.\d+)+)\.tar\.gz
}
- prog asterisk16:libiax = {
- version = %{V_asterisk_libiax}
- url = http://downloads.digium.com/pub/libiax/
- regex = iax-(\d+\.\d+(\.\d+)+)\.tar\.gz
- }
prog asterisk16:agi = {
version = %{V_asterisk_perl}
url = http://asterisk.gnuinter.net/files/
@@ -179,7 +172,6 @@
%setup -q -n asterisk-%{V_asterisk} -D -T -a 1
%setup -q -n asterisk-%{V_asterisk} -D -T -a 4
%setup -q -n asterisk-%{V_asterisk} -D -T -a 5
- %setup -q -n asterisk-%{V_asterisk} -D -T -a 6
%patch -p0
cp %{SOURCE2} %{SOURCE3} sounds/
%{l_shtool} subst \
@@ -382,17 +374,6 @@
) || exit $?
%endif
- # build libiax
- ( cd iax-%{V_asterisk_libiax}
- %{l_prefix}/bin/config install .
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- ./configure \
- --prefix=%{l_prefix} \
- --disable-shared
- %{l_make} %{l_mflags -O}
- ) || exit $?
-
# build Perl API
%{l_prefix}/bin/perl-openpkg prepare
%{l_prefix}/bin/perl-openpkg -d asterisk-perl-%{V_asterisk_perl}
configure build
@@ -418,11 +399,6 @@
) || exit $?
%endif
- # install libiax
- ( cd iax-%{V_asterisk_libiax}
- %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
- ) || exit $?
-
# install Perl API
%{l_prefix}/bin/perl-openpkg -d asterisk-perl-%{V_asterisk_perl} install
%{l_shtool} install -c -m 644 %{l_value -s -a} \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
