SPECS: asterisk.spec - finish t30 support

[aredridel]

Author: aredridel                    Date: Wed Oct  5 20:19:43 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- finish t30 support

---- Files affected:
SPECS:
   asterisk.spec (1.55 -> 1.56) 

---- Diffs:

================================================================
Index: SPECS/asterisk.spec
diff -u SPECS/asterisk.spec:1.55 SPECS/asterisk.spec:1.56
--- SPECS/asterisk.spec:1.55	Tue Sep 20 20:23:22 2005
+++ SPECS/asterisk.spec	Wed Oct  5 22:19:37 2005
@@ -9,7 +9,6 @@
 #
 # Conditional build:
 %bcond_without	openh323	# without OpenH323 support
-%bcond_with			t30				# without T30 support
 #
 Summary:	Asterisk PBX
 Summary(pl):	Centralka (PBX) Asterisk
@@ -22,7 +21,6 @@
 # Source0-md5:	0d7f1c680ae53a739f26a069ef8b580a
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
-Source3:	asterisk-t30.tar.gz
 Patch0:		%{name}-openh323-makefile.patch
 Patch1:		%{name}-Makefile_fix_gcc33.patch
 Patch2:		%{name}-no_k6_on_sparc.patch
@@ -47,7 +45,8 @@
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	sed >= 4.0
 BuildRequires:	speex-devel
-%{?with_t30:BuildRequires:	spandsp-devel >= 0.0.3-0.pre1.1}
+BuildRequires:	spandsp-devel >= 0.0.2-0.pre20.1
+BuildRequires:	spandsp-devel < 0.0.3
 BuildRequires:	unixODBC-devel
 BuildRequires:	zaptel-devel
 BuildRequires:	zlib-devel
@@ -121,9 +120,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%if %{with t30}
 %patch7 -p1
-%endif
 
 sed -i -e "s#/usr/lib/#/usr/%{_lib}/#g#" Makefile
 
@@ -246,6 +243,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56  2005/10/05 20:19:37  aredridel
+- finish t30 support
+
 Revision 1.55  2005/09/20 18:23:22  aredridel
 - add initial t30 stub work, NFY
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/asterisk.spec?r1=1.55&r2=1.56&f=u