From f5a8d2bcd0b9696fc7569be25c12e310c3134fad Mon Sep 17 00:00:00 2001 From: pawcioos Date: Mon, 21 Nov 2005 13:56:10 +0000 Subject: [PATCH] - updated to 1.2.0 Changed files: asterisk-Makefile_fix_gcc33.patch -> 1.2 asterisk-lib.patch -> 1.2 asterisk-no_k6_on_sparc.patch -> 1.4 asterisk.spec -> 1.60 --- asterisk-Makefile_fix_gcc33.patch | 26 ++++++++++----------- asterisk-lib.patch | 37 +++++++---------------------- asterisk-no_k6_on_sparc.patch | 19 +++++++-------- asterisk.spec | 39 ++++++++++++++++++------------- 4 files changed, 54 insertions(+), 67 deletions(-) diff --git a/asterisk-Makefile_fix_gcc33.patch b/asterisk-Makefile_fix_gcc33.patch index b491850..7a7be44 100644 --- a/asterisk-Makefile_fix_gcc33.patch +++ b/asterisk-Makefile_fix_gcc33.patch @@ -1,13 +1,13 @@ ---- Makefile~ 2004-09-16 20:46:39.000000000 +0200 -+++ Makefile 2004-11-15 20:53:39.660750720 +0100 -@@ -22,8 +22,8 @@ - PROC=$(shell uname -m) - ifeq ($(PROC),x86_64) - # You must have GCC 3.4 to use k8, otherwise use athlon --PROC=k8 --#PROC=athlon -+#PROC=k8 -+PROC=athlon - OPTIONS+=-m64 - endif - ifeq ($(PROC),sparc64) +--- asterisk-1.2.0/Makefile.orig 2005-11-21 14:34:29.000000000 +0100 ++++ asterisk-1.2.0/Makefile 2005-11-21 14:34:36.000000000 +0100 +@@ -177,8 +177,8 @@ + + ifeq ($(PROC),x86_64) + # You must have GCC 3.4 to use k8, otherwise use athlon +- PROC=k8 +- #PROC=athlon ++ #PROC=k8 ++ PROC=athlon + OPTIONS+=-m64 + endif + diff --git a/asterisk-lib.patch b/asterisk-lib.patch index 6650b1e..983c932 100644 --- a/asterisk-lib.patch +++ b/asterisk-lib.patch @@ -1,32 +1,13 @@ ---- asterisk-1.0.6/channels/h323/Makefile~ 2004-11-15 03:35:35.000000000 +0100 -+++ asterisk-1.0.6/channels/h323/Makefile 2005-03-01 17:04:12.200095264 +0100 -@@ -84,13 +84,13 @@ +--- asterisk-1.2.0/channels/Makefile.orig 2005-11-21 13:47:31.000000000 +0100 ++++ asterisk-1.2.0/channels/Makefile 2005-11-21 13:49:38.000000000 +0100 +@@ -31,8 +31,8 @@ endif - chan_h323.so: -- $(CXX) -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib $(CHANH323LIB) -+ $(CXX) -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -L$(OPENH323DIR)/lib -lpt -lopenh323 -L/usr/lib $(CHANH323LIB) - - chan_h323_d.so: chan_h323.o ast_h323.o -- $(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib $(CHANH323LIB) -+ $(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -L$(OPENH323DIR)/lib -lpt -lopenh323 -L/usr/lib $(CHANH323LIB) - - chan_h323_s.so: chan_h323.o ast_h323.o -- $(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib $(CHANH323LIB) -+ $(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -L$(OPENH323DIR)/lib -lpt -lopenh323 -L/usr/lib $(CHANH323LIB) - clean: - rm -f *.o *.so core.* libchanh323.a .depend - ---- asterisk-1.0.6/channels/Makefile~ 2004-08-31 18:33:00.000000000 +0200 -+++ asterisk-1.0.6/channels/Makefile 2005-03-01 21:18:40.334985952 +0100 -@@ -46,8 +46,8 @@ - endif ifeq (${OSARCH},Linux) - MYSQLLIB=-L/usr/lib/mysql -lmysqlclient --PTLIB=-lpt_linux_x86_r --H323LIB=-lh323_linux_x86_r -+PTLIB=-lpt -+H323LIB=-lopenh323 - CHANH323LIB=-ldl +- PTLIB=-lpt_linux_x86_r +- H323LIB=-lh323_linux_x86_r ++ PTLIB=-lpt ++ H323LIB=-lopenh323 + CHANH323LIB=-ldl + endif - ifeq ($(PROC),sparc64) diff --git a/asterisk-no_k6_on_sparc.patch b/asterisk-no_k6_on_sparc.patch index b133851..1c2e932 100644 --- a/asterisk-no_k6_on_sparc.patch +++ b/asterisk-no_k6_on_sparc.patch @@ -1,15 +1,14 @@ -diff -ur asterisk-1.0.8-o/codecs/gsm/Makefile asterisk-1.0.8/codecs/gsm/Makefile ---- asterisk-1.0.8-o/codecs/gsm/Makefile 2005-06-21 08:27:28.000000000 -0600 -+++ asterisk-1.0.8/codecs/gsm/Makefile 2005-06-23 23:28:35.000000000 -0600 -@@ -224,6 +224,7 @@ +--- asterisk-1.2.0/codecs/gsm/Makefile.orig 2005-11-21 13:34:00.000000000 +0100 ++++ asterisk-1.2.0/codecs/gsm/Makefile 2005-11-21 13:40:02.000000000 +0100 +@@ -235,6 +235,7 @@ ifneq ($(shell uname -m),alpha) ifneq ($(shell uname -m),armv4l) ifneq ($(shell uname -m),sparc64) +ifneq ($(shell uname -m),sparc) + ifneq (${PROC},arm) GSM_SOURCES+= $(SRC)/k6opt.s endif - endif -@@ -231,6 +232,7 @@ +@@ -245,6 +246,7 @@ endif endif endif @@ -17,15 +16,15 @@ diff -ur asterisk-1.0.8-o/codecs/gsm/Makefile asterisk-1.0.8/codecs/gsm/Makefile TOAST_SOURCES = $(SRC)/toast.c \ $(SRC)/toast_lin.c \ -@@ -282,6 +284,7 @@ +@@ -296,6 +298,7 @@ + ifneq ($(shell uname -m), ppc64) ifneq ($(shell uname -m), alpha) - ifneq ($(shell uname -m), armv4l) ifneq ($(shell uname -m), sparc64) +ifneq ($(shell uname -m), sparc) + ifneq ($(shell uname -m), armv4l) GSM_OBJECTS+= $(SRC)/k6opt.o endif - endif -@@ -289,6 +292,7 @@ +@@ -305,6 +308,7 @@ endif endif endif diff --git a/asterisk.spec b/asterisk.spec index 6b71d35..e3668fc 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -12,24 +12,24 @@ Summary: Asterisk PBX Summary(pl): Centralka (PBX) Asterisk Name: asterisk -Version: 1.0.9 -Release: 4 +Version: 1.2.0 +Release: 1 License: GPL v2 Group: Applications/System Source0: ftp://ftp.digium.com/pub/%{name}/%{name}-%{version}.tar.gz -# Source0-md5: 0d7f1c680ae53a739f26a069ef8b580a +# Source0-md5: 61d7f29b586ba9b9b5fbb67f952fd3ca Source1: %{name}.init Source2: %{name}.sysconfig -Patch0: %{name}-openh323-makefile.patch +#Patch0: %{name}-openh323-makefile.patch Patch1: %{name}-Makefile_fix_gcc33.patch Patch2: %{name}-no_k6_on_sparc.patch Patch3: %{name}-lib.patch -Patch4: %{name}-openh323-formats.patch -Patch5: %{name}-openh323-rtti.patch -Patch6: %{name}-freetds.patch -Patch7: %{name}-t30.patch +#Patch4: %{name}-openh323-formats.patch +#Patch5: %{name}-openh323-rtti.patch +#Patch6: %{name}-freetds.patch +#Patch7: %{name}-t30.patch Patch8: %{name}-awk.patch -Patch9: %{name}-noarch.patch +#Patch9: %{name}-noarch.patch # It's included, but these sources are broken by me :) # will fit on clean cvs source #Patch1: %{name}-DESTDIR.patch @@ -115,15 +115,16 @@ Pliki przyk %prep %setup -q -%patch1 -p0 +#%patch0 -p1 +%patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 +#%patch4 -p1 +#%patch5 -p1 +#%patch6 -p1 +#%patch7 -p1 %patch8 -p1 -%patch9 -p1 +#%patch9 -p1 sed -i -e "s#/usr/lib/#/usr/%{_lib}/#g#" Makefile @@ -190,6 +191,7 @@ fi %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/sysconfig/%{name} %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/asterisk/*.conf %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/asterisk/*.adsi +%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/asterisk/extensions.ael %dir %{_libdir}/asterisk %dir %{_libdir}/asterisk/modules %attr(755,root,root) %{_libdir}/asterisk/modules/*.so @@ -203,22 +205,27 @@ fi /var/lib/asterisk/mohmp3/fpm-world-mix.mp3 %dir /var/lib/asterisk/sounds %dir /var/lib/asterisk/sounds/digits +%dir /var/lib/asterisk/sounds/dictate %dir /var/lib/asterisk/sounds/letters %dir /var/lib/asterisk/sounds/phonetic /var/lib/asterisk/images/*.jpg /var/lib/asterisk/keys/*.pub /var/lib/asterisk/sounds/*.gsm /var/lib/asterisk/sounds/digits/*.gsm +/var/lib/asterisk/sounds/dictate/*.gsm /var/lib/asterisk/sounds/letters/*.gsm /var/lib/asterisk/sounds/phonetic/*.gsm %dir /var/spool/asterisk %dir /var/spool/asterisk/monitor -%dir /var/spool/asterisk/vm +#%%dir /var/spool/asterisk/vm %dir /var/spool/asterisk/voicemail %dir /var/spool/asterisk/voicemail/default %dir /var/log/asterisk %dir /var/log/asterisk/cdr-csv %{_mandir}/man8/asterisk.8* +%{_mandir}/man8/astgenkey.8* +%{_mandir}/man8/autosupport.8* +%{_mandir}/man8/safe_asterisk.8* %dir /var/lib/asterisk/firmware %dir /var/lib/asterisk/firmware/iax /var/lib/asterisk/firmware/iax/iaxy.bin -- 2.44.0