[packages/asterisk/ASTERISK_1_8] Version: 1.8.14.1
jajcus
jajcus at pld-linux.org
Mon Jul 23 14:48:11 CEST 2012
commit 9a6e1ab76f3a2fcb77c4adbb3cc966f3edfda083
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Mon Jul 23 14:44:52 2012 +0200
Version: 1.8.14.1
'usbradio' and 'rpt' are no more
asterisk.spec | 21 ++-------------------
mxml-system.patch | 14 ++++++++------
2 files changed, 10 insertions(+), 25 deletions(-)
---
diff --git a/asterisk.spec b/asterisk.spec
index 85b0888..9ed4aca 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -17,7 +17,6 @@
# NBS=0 AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [nbs])
# SS7=0 AST_EXT_LIB_SETUP([SS7], [ISDN SS7], [ss7])
# VPBAPI=0 AST_EXT_LIB_SETUP([VPB], [Voicetronix API], [vpb])
-# - %attr(755,root,root) %{_libdir}/asterisk/modules/chan_usbradio.so
# - app_{rx,tx}fax seems to b replaced by app_fax alongside latest spanddsp
# See: http://sourceforge.net/projects/agx-ast-addons/
# https://agx-ast-addons.svn.sourceforge.net/svnroot/agx-ast-addons/trunk/attic/
@@ -39,12 +38,12 @@
Summary: Asterisk PBX
Summary(pl.UTF-8): Centralka (PBX) Asterisk
Name: asterisk
-Version: 1.8.12.0
+Version: 1.8.14.1
Release: %{rel}%{?with_bristuff:.bristuff}
License: GPL v2
Group: Applications/System
Source0: http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 73d1da06da61f652a6c83f2604350df5
+# Source0-md5: b60ea1459613fc1d6f0ebc06c6fb4175
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.tmpfiles
@@ -53,7 +52,6 @@ Source10: app_txfax.c
Source11: app_rxfax.c
Patch0: mxml-system.patch
Patch1: lua51-path.patch
-Patch2: %{name}-no_k6_on_sparc.patch
Patch3: %{name}-lib.patch
Patch4: %{name}-ppc.patch
Patch5: external-libedit.patch
@@ -470,14 +468,6 @@ Requires: %{name} = %{version}-%{release}
%description unistim
Unistim channel for Asterisk
-%package usbradio
-Summary: USB radio channel for Asterisk
-Group: Applications/Networking
-Requires: %{name} = %{version}-%{release}
-
-%description usbradio
-Unistim channel for Asterisk
-
%package voicemail
Summary: Common Voicemail Modules for Asterisk
Group: Applications/Networking
@@ -542,7 +532,6 @@ API documentation for Asterisk.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p0
@@ -876,7 +865,6 @@ chown -R asterisk:asterisk /var/lib/asterisk
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/queuerules.conf
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/queues.conf
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_stun_monitor.conf
-%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/rpt.conf
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/rtp.conf
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/say.conf
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/sip*.conf
@@ -1321,11 +1309,6 @@ chown -R asterisk:asterisk /var/lib/asterisk
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/unistim.conf
%attr(755,root,root) %{_libdir}/asterisk/modules/chan_unistim.so
-%files usbradio
-%defattr(644,root,root,755)
-%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/usbradio.conf
-#%attr(755,root,root) %{_libdir}/asterisk/modules/chan_usbradio.so
-
%files voicemail
%defattr(644,root,root,755)
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/voicemail.conf
diff --git a/mxml-system.patch b/mxml-system.patch
index 41abc5e..9f7b5ab 100644
--- a/mxml-system.patch
+++ b/mxml-system.patch
@@ -1,9 +1,10 @@
---- 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
+diff -dur asterisk-1.8.14.1.orig/menuselect/Makefile asterisk-1.8.14.1/menuselect/Makefile
+--- asterisk-1.8.14.1.orig/menuselect/Makefile 2012-05-09 21:57:43.000000000 +0200
++++ asterisk-1.8.14.1/menuselect/Makefile 2012-07-23 14:06:28.000000000 +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
+ CFLAGS+=-g -D_GNU_SOURCE -Wall
+MXML_LIB:=$(shell pkg-config --libs mxml)
ifeq ($(MENUSELECT_DEBUG),yes)
@@ -33,15 +34,16 @@
all: $(ALL_TGTS)
@@ -66,7 +68,7 @@
makeopts autoconfig.h: autoconfig.h.in makeopts.in
- @./configure $(CONFIGURE_SILENT) CC= LD= AR= CFLAGS=
+ @./configure $(CONFIGURE_SILENT)
-$(ALL_TGTS): mxml/libmxml.a
+$(ALL_TGTS):
ifdef C_OBJS
menuselect_curses.o: CFLAGS+=$(C_INCLUDE)
---- asterisk-1.8.0/menuselect/menuselect.c.orig 2010-08-25 04:42:41.000000000 +0300
-+++ asterisk-1.8.0/menuselect/menuselect.c 2010-10-23 12:10:31.077483673 +0300
+diff -dur asterisk-1.8.14.1.orig/menuselect/menuselect.c asterisk-1.8.14.1/menuselect/menuselect.c
+--- asterisk-1.8.14.1.orig/menuselect/menuselect.c 2011-11-09 23:22:13.000000000 +0100
++++ asterisk-1.8.14.1/menuselect/menuselect.c 2012-07-23 14:06:10.000000000 +0200
@@ -32,7 +32,7 @@
#include <getopt.h>
More information about the pld-cvs-commit
mailing list