Author: arekm                        Date: Sat Jun 10 22:14:32 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed build; fax bcond on; gcc 3.3 patch -> /dev/null

---- Files affected:
SPECS:
   asterisk.spec (1.77 -> 1.78) 

---- Diffs:

================================================================
Index: SPECS/asterisk.spec
diff -u SPECS/asterisk.spec:1.77 SPECS/asterisk.spec:1.78
--- SPECS/asterisk.spec:1.77    Wed Jun  7 00:17:19 2006
+++ SPECS/asterisk.spec Sun Jun 11 00:14:27 2006
@@ -9,7 +9,7 @@
 #
 # Conditional build:
 %bcond_without openh323        # without OpenH323 support
-%bcond_with            rxfax           # with rx (also tx :-D) fax
+%bcond_without         rxfax           # without rx (also tx :-D) fax
 
 %define _spandsp_version 0.0.2pre25
 #
@@ -25,7 +25,6 @@
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 #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
@@ -39,12 +38,16 @@
 #Patch1:       %{name}-DESTDIR.patch
 #Patch2:       %{name}-Makefile2.patch
 Source10:      
http://soft-switch.org/downloads/spandsp/spandsp-%{_spandsp_version}/asterisk-1.2.x/app_txfax.c
+# Source10-md5:        8c8fcb263b76897022b4c28052a7b439
 Source11:      
http://soft-switch.org/downloads/spandsp/spandsp-%{_spandsp_version}/asterisk-1.2.x/app_rxfax.c
-Patch10:       
http://soft-switch.org/downloads/spandsp/spandsp-%{_spandsp_version}/asterisk-1.2.x/apps_Makefile.patch
+# Source11-md5:        ab6983b51c412883545b36993d704999
+# 
http://soft-switch.org/downloads/spandsp/spandsp-%{_spandsp_version}/asterisk-1.2.x/apps_Makefile.patch
+Patch10:       %{name}-txfax-Makefile.patch
 URL:           http://www.asterisk.org/
 BuildRequires: bison
 BuildRequires: freetds >= 0.63
 BuildRequires: gawk
+BuildRequires: gcc >= 5:3.4
 #BuildRequires:        glib-devel
 #BuildRequires:        gtk+-devel
 BuildRequires: libpri-devel >= 1.2.3
@@ -125,7 +128,6 @@
 %prep
 %setup -q
 #%patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 #%patch4 -p1
@@ -137,7 +139,7 @@
 
 %if %{with rxfax}
 cd apps
-%patch10 -p2
+%patch10 -p0
 cp %{SOURCE10} .
 cp %{SOURCE11} .
 %endif
@@ -261,6 +263,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78  2006/06/10 22:14:27  arekm
+- fixed build; fax bcond on; gcc 3.3 patch -> /dev/null
+
 Revision 1.77  2006/06/06 22:17:19  areq
 - 1.2.9.1
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to