packages: asterisk/asterisk.spec, asterisk/mxml-system.patch (NEW) - build ...

[glen]

Author: glen                         Date: Wed Dec 30 21:23:08 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- build with system mlxm

---- Files affected:
packages/asterisk:
   asterisk.spec (1.152 -> 1.153) , mxml-system.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/asterisk/asterisk.spec
diff -u packages/asterisk/asterisk.spec:1.152 packages/asterisk/asterisk.spec:1.153
--- packages/asterisk/asterisk.spec:1.152	Wed Dec 30 21:21:37 2009
+++ packages/asterisk/asterisk.spec	Wed Dec 30 22:23:03 2009
@@ -34,7 +34,7 @@
 %bcond_without	verbose		# verbose build
 
 %define		spandsp_version 0.0.2pre26
-%define		rel	0.30
+%define		rel	0.32
 Summary:	Asterisk PBX
 Summary(pl.UTF-8):	Centralka (PBX) Asterisk
 Name:		asterisk
@@ -51,6 +51,7 @@
 # Source10-md5:	8c8fcb263b76897022b4c28052a7b439
 Source11:	http://soft-switch.org/downloads/spandsp/spandsp-%{spandsp_version}/asterisk-1.2.x/app_rxfax.c
 # Source11-md5:	ab6983b51c412883545b36993d704999
+Patch0:		mxml-system.patch
 Patch1:		lua51-path.patch
 Patch2:		%{name}-no_k6_on_sparc.patch
 Patch3:		%{name}-lib.patch
@@ -90,6 +91,7 @@
 BuildRequires:	libvorbis-devel
 BuildRequires:	lua51-devel
 BuildRequires:	mISDNuser-devel
+BuildRequires:	mxml-devel
 BuildRequires:	mysql-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	net-snmp-devel
@@ -449,6 +451,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -482,7 +485,7 @@
 %{__sed} -i -e 's/^install:.*$/install:/' sounds/Makefile
 
 # avoid using it
-rm -rf imap
+rm -rf imap menuselect/mxml
 
 %build
 rm -f pbx/.depend
@@ -496,10 +499,6 @@
 export WGET="/bin/true"
 
 # be sure to invoke ./configure with our flags
-cd menuselect/mxml
-%configure2_13
-cd ../../
-
 cd menuselect
 %{__aclocal}
 %{__autoheader}
@@ -1181,6 +1180,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.153  2009/12/30 21:23:03  glen
+- build with system mlxm
+
 Revision 1.152  2009/12/30 20:21:37  glen
 - make channels/h323/Makefile.ast seems fixin chan_323.so linking
 

================================================================
Index: packages/asterisk/mxml-system.patch
diff -u /dev/null packages/asterisk/mxml-system.patch:1.1
--- /dev/null	Wed Dec 30 22:23:08 2009
+++ packages/asterisk/mxml-system.patch	Wed Dec 30 22:23:03 2009
@@ -0,0 +1,54 @@
+--- asterisk-1.6.1.12/menuselect/Makefile~	2008-12-11 00:00:19.000000000 +0200
++++ asterisk-1.6.1.12/menuselect/Makefile	2009-12-30 23:14:47.201686543 +0200
+@@ -23,6 +23,7 @@
+ # Basic set of sources and flags/libraries/includes
+ OBJS:=menuselect.o strcompat.o
+ CFLAGS:=-g -c -D_GNU_SOURCE -Wall
++MXML_LIB:=$(shell pkg-config --libs mxml)
+ 
+ ifeq ($(MENUSELECT_DEBUG),yes)
+   CFLAGS += -DMENUSELECT_DEBUG
+@@ -44,19 +45,20 @@
+ 
+ ifdef GTK2_LIB
+   G_OBJS += menuselect_gtk.o
+-  G_LIBS += $(GTK2_LIB)
++  G_LIBS += $(MXML_LIB) $(GTK2_LIB)
+   G_INCLUDE += $(GTK2_INCLUDE)
+   ALL_TGTS += gmenuselect
+ endif
+ 
+ ifdef NEWT_LIB
+   N_OBJS += menuselect_newt.o
+-  N_LIBS += $(NEWT_LIB)
++  N_LIBS += $(MXML_LIB) $(NEWT_LIB)
+   N_INCLUDE += $(NEWT_INCLUDE)
+   ALL_TGTS += nmenuselect
+ endif
+ 
+ M_OBJS += menuselect_stub.o
++M_LIBS += $(MXML_LIB)
+ ALL_TGTS += menuselect
+ 
+ all: $(ALL_TGTS)
+@@ -66,7 +68,7 @@
+ makeopts autoconfig.h: autoconfig.h.in makeopts.in
+ 	@./configure $(CONFIGURE_SILENT) CC= LD= AR= CFLAGS=
+ 
+-$(ALL_TGTS): mxml/libmxml.a
++$(ALL_TGTS):
+ 
+ ifdef C_OBJS
+ menuselect_curses.o: CFLAGS+=$(C_INCLUDE)
+--- asterisk-1.6.1.12/menuselect/menuselect.c~	2009-06-03 02:21:48.000000000 +0300
++++ asterisk-1.6.1.12/menuselect/menuselect.c	2009-12-30 23:18:45.881616815 +0200
+@@ -29,8 +29,8 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <stdarg.h>
++#include <mxml.h>
+ 
+-#include "mxml/mxml.h"
+ #include "linkedlists.h"
+ #include "menuselect.h"
+ 
================================================================

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