rpms/openoffice.org/devel openoffice.org.spec, 1.1050, 1.1051 openoffice.org.2.0.3.gcc28370.statics.patch, 1.3, 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-serv22674

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org.2.0.3.gcc28370.statics.patch 
Log Message:
undo statics


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1050
retrieving revision 1.1051
diff -u -r1.1050 -r1.1051
--- openoffice.org.spec	21 Feb 2007 17:05:53 -0000	1.1050
+++ openoffice.org.spec	21 Feb 2007 17:12:09 -0000	1.1051
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 8
-%define rh_rpm_release 4
+%define rh_rpm_release 3
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -119,8 +119,7 @@
 Patch64: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
 Patch65: openoffice.org-2.2.0.ooo74401.basctl.boost.patch
 Patch66: openoffice.org-2.2.0.ooo74692.64bitsig.patch
-Patch67: openoffice.org.2.0.3.gcc28370.statics.patch
-Patch68: workspace.configrefactor01.patch
+Patch67: workspace.configrefactor01.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1034,8 +1033,7 @@
 %patch64 -p1 -b .ooo74451.sw.typemismatch.patch
 %patch65 -p1 -b .ooo74401.basctl.boost.patch
 %patch66 -p0 -b .ooo74692.64bitsig.patch
-%patch67 -p0 -b .gcc28370.statics.patch
-%patch68 -p0 -b .workspace.configrefactor01.patch
+%patch67 -p0 -b .workspace.configrefactor01.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 
@@ -1068,7 +1066,7 @@
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
-export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64 -finline-limit=60"
+export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64"
 #convert _smp_mflags to dmake equivalent
 SMP_MFLAGS=%{?_smp_mflags}
 SMP_MFLAGS=${SMP_MFLAGS/-j/-P}
@@ -2575,9 +2573,6 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Wed Feb 21 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-8.4
-- try smaller inline limit
-
 * Wed Feb 21 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-8.3
 - add workspace.configrefactor01.patch and knock approx 1/2 sec off warm start
 


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