rpms/openoffice.org/devel openoffice.org.spec, 1.770, 1.771 openoffice.org.2.0.3.gcc28370.statics.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23839

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org.2.0.3.gcc28370.statics.patch 
Log Message:
4.1.1-8 fixes gcc28370


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.770
retrieving revision 1.771
diff -u -r1.770 -r1.771
--- openoffice.org.spec	16 Jul 2006 19:49:46 -0000	1.770
+++ openoffice.org.spec	17 Jul 2006 09:07:10 -0000	1.771
@@ -48,7 +48,7 @@
 Source12:       ooo64726.sdf
 BuildRequires:	tcsh, perl, sed, zip, bzip2, unzip, tar, findutils, prelink
 BuildRequires:	autoconf, make >= 3.79.1, flex, bison, perl-Compress-Zlib
-BuildRequires:	gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils, gcc-java >= 4.0.2
+BuildRequires:	gcc, gcc-c++ >= 4.1.1-8, binutils, gcc-java >= 4.1.1 
 BuildRequires:	libgcj-devel >= 4.0.2, java-1.4.2-gcj-compat-devel, zlib-devel
 BuildRequires:	freetype-devel, gtk2-devel >= 2.9.4, gnome-vfs2-devel
 BuildRequires:	cups-devel, curl-devel, boost-devel >= 1.31.0, python-devel
@@ -112,9 +112,8 @@
 Patch46: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 Patch47: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 Patch48: ooobuild.VBAObjects.patch
-Patch49: openoffice.org.2.0.3.gcc28370.statics.patch
-Patch50: openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
-Patch51: openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch
+Patch49: openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
+Patch50: openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -854,9 +853,8 @@
 %patch46 -p1 -b .rh187919.gtkunderkde.patch
 %patch47 -p1 -b .ooo67186.sw.eventisULONG.patch
 %patch48 -p0 -b .ooobuild.VBAObjects.patch
-%patch49 -p1 -b .gcc28370.statics.patch
-%patch50 -p1 -b .gccXXXXX.anonymousexternc.patch
-%patch51 -p1 -b .gccXXXXX.all.tediousanonfoo.patch
+%patch49 -p1 -b .gccXXXXX.anonymousexternc.patch
+%patch50 -p1 -b .gccXXXXX.all.tediousanonfoo.patch
 
 tar xzf %{SOURCE1}
 
@@ -3342,6 +3340,7 @@
 - fix use of freetype headers for new freetype
 - rebuild for new tasty linker hash
     + add openoffice.org.2.0.3.gcc28370.statics.patch to workaround gcc28370
+	-> drop with 4.1.1-8
     + add openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
     + add openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch to workaround more gcc foo
 


--- openoffice.org.2.0.3.gcc28370.statics.patch DELETED ---