SPECS: openoffice.org.spec - gcc4 patch breaks build with gcc 3.3 ...

[qboosh]

Author: qboosh                       Date: Wed Dec 28 15:22:57 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- gcc4 patch breaks build with gcc 3.3 - moved to bcond

---- Files affected:
SPECS:
   openoffice.org.spec (1.572 -> 1.573) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.572 SPECS/openoffice.org.spec:1.573
--- SPECS/openoffice.org.spec:1.572	Mon Dec 26 09:30:41 2005
+++ SPECS/openoffice.org.spec	Wed Dec 28 16:22:51 2005
@@ -58,6 +58,7 @@
 %bcond_with	java		# Java support
 %bcond_with	vfs		# Enable GNOME VFS and Evolution 2 support
 %bcond_with	mono
+%bcond_with	gcc4		# use gcc4 patch (breaks build with gcc 3.3.x)
 
 %define		ver		2.0
 %define		rel		1
@@ -1663,8 +1664,10 @@
 # add to ooo-build patch-system
 install %{PATCH0} patches/src680
 install %{PATCH1} patches/64bit
+%if %{with gcc4}
 install %{PATCH3} patches/src680
 (echo "[ Fixes ]"; echo `basename %{PATCH3}`) >>patches/src680/apply
+%endif
 # fake patch to make buildsystem happy (patch is included)
 touch patches/64bit/cws-ooo64bit02.2005-04-19-math-h.diff
 
@@ -2191,6 +2194,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.573  2005/12/28 15:22:51  qboosh
+- gcc4 patch breaks build with gcc 3.3 - moved to bcond
+
 Revision 1.572  2005/12/26 08:30:41  qrczak
 - Oops, the patch list was being patched in a wrong place.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.572&r2=1.573&f=u