rpms/asterisk/devel asterisk-1.6.0-beta4-funcdesc.patch, NONE, 1.1 asterisk.spec, 1.13, 1.14

[Jeffrey C. Ollie (jcollie)]

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6555

Modified Files:
	asterisk.spec 
Added Files:
	asterisk-1.6.0-beta4-funcdesc.patch 
Log Message:
Add patch from David Woodhouse that fixes building on PPC64.

asterisk-1.6.0-beta4-funcdesc.patch:

--- NEW FILE asterisk-1.6.0-beta4-funcdesc.patch ---
diff -urp asterisk-1.6.0-beta4.orig/build_tools/strip_nonapi asterisk-1.6.0-beta4/build_tools/strip_nonapi
--- asterisk-1.6.0-beta4.orig/build_tools/strip_nonapi	2008-01-02 09:05:30.000000000 -0500
+++ asterisk-1.6.0-beta4/build_tools/strip_nonapi	2008-02-26 22:25:31.000000000 -0500
@@ -16,11 +16,20 @@
 #	pbx_
 #	resample_
 
+case "${PROC}" in
+    powerpc64)
+	TEXTSYM=" D "
+	;;
+    *)
+	TEXTSYM=" T "
+	;;
+esac
+
 FILTER="${GREP} -v -e ^ast_ -e ^_ast_ -e ^__ast_ -e ^astman_ -e ^pbx_ -e ^resample_"
 
 case "${OSARCH}" in
     linux-gnu|FreeBSD)
-	nm ${1} | ${GREP} -e " T " | cut -d" " -f3 | ${FILTER} > striplist
+	nm ${1} | ${GREP} -e "$TEXTSYM" | cut -d" " -f3 | ${FILTER} > striplist
 	sed -e "s/^/-N /" striplist | xargs ${STRIP} ${1}
 	rm -f striplist
 	;;
diff -urp asterisk-1.6.0-beta4.orig/main/Makefile asterisk-1.6.0-beta4/main/Makefile
--- asterisk-1.6.0-beta4.orig/main/Makefile	2008-01-29 12:44:05.000000000 -0500
+++ asterisk-1.6.0-beta4/main/Makefile	2008-02-26 22:27:44.000000000 -0500
@@ -163,7 +163,7 @@ ifneq ($(findstring chan_h323,$(MENUSELE
 else
 	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS)
 endif
-	@$(ASTTOPDIR)/build_tools/strip_nonapi $@
+	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
 
 clean::
 	rm -f asterisk


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- asterisk.spec	26 Feb 2008 22:56:39 -0000	1.13
+++ asterisk.spec	27 Feb 2008 04:26:10 -0000	1.14
@@ -4,14 +4,11 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.0
-Release: 0.1.beta4%{?dist}
+Release: 0.2.beta4%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=435035
-ExcludeArch: ppc64
-
 # The asterisk tarball contains some items that we don't want in there,
 # so start with the original tarball from here:
 # http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-%{version}.tar.gz
@@ -45,6 +42,7 @@
 Patch8:  asterisk-1.6.0-beta4-lua.patch
 Patch9:  asterisk-1.6.0-beta4-autoconf.patch
 Patch10: asterisk-1.6.0-beta4-astcanary.patch
+Patch11: asterisk-1.6.0-beta4-funcdesc.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -406,6 +404,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -1009,6 +1008,12 @@
 %{_libdir}/asterisk/modules/codec_zap.so
 
 %changelog
+* Tue Feb 26 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0-0.2.beta4
+- Add patch from David Woodhouse that fixes building on PPC64.
+
+* Tue Feb 26 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0-0.1.beta4
+- Update to 1.6.0 beta 4
+
 * Wed Feb 13 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.18-1
 - Update to 1.4.18.
 - Use -march=i486 on i386 builds for atomic operations (GCC 4.3