- build with system mlxm

Changed files:
    asterisk.spec -> 1.153
    mxml-system.patch -> 1.1

diff --git a/asterisk.spec b/asterisk.spec
index f06253ad4b3410fb18f145841b0980c990d37808..2df31174dcc6ad441b8e0fa62b8b375b6b74a22f 100644 (file)
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -33,7 +33,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
@@ -50,6 +50,7 @@ Source10:     http://soft-switch.org/downloads/spandsp/spandsp-%{spandsp_version}/as
 # 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
@@ -89,6 +90,7 @@ BuildRequires:        libogg-devel
 BuildRequires: libvorbis-devel
 BuildRequires: lua51-devel
 BuildRequires: mISDNuser-devel
+BuildRequires: mxml-devel
 BuildRequires: mysql-devel
 BuildRequires: ncurses-devel
 BuildRequires: net-snmp-devel
@@ -448,6 +450,7 @@ local filesystem.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -481,7 +484,7 @@ cp %{SOURCE11} .
 %{__sed} -i -e 's/^install:.*$/install:/' sounds/Makefile
 
 # avoid using it
-rm -rf imap
+rm -rf imap menuselect/mxml
 
 %build
 rm -f pbx/.depend
@@ -495,10 +498,6 @@ export ASTLDFLAGS="%{rpmldflags}"
 export WGET="/bin/true"
 
 # be sure to invoke ./configure with our flags
-cd menuselect/mxml
-%configure2_13
-cd ../../
-
 cd menuselect
 %{__aclocal}
 %{__autoheader}

diff --git a/mxml-system.patch b/mxml-system.patch
new file mode 100644 (file)
index 0000000..bd02265
--- /dev/null
+++ b/mxml-system.patch
@@ -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"
+