rpms/openoffice.org/devel openoffice.org.spec, 1.538, 1.539 sources, 1.129, 1.130 openoffice.org-1.9.84.ooo44843.sdcasting.patch, 1.4, NONE openoffice.org-1.9.84.ooo44846.svxcasting.patch, 1.3, NONE openoffice.org-1.9.84.ooo45162.svxcasting2.patch, 1.3, NONE

Fri Nov 11 10:56:07 UTC 2005

Author: caolanm

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

Modified Files:
	openoffice.org.spec sources 
Removed Files:
	openoffice.org-1.9.84.ooo44843.sdcasting.patch 
	openoffice.org-1.9.84.ooo44846.svxcasting.patch 
	openoffice.org-1.9.84.ooo45162.svxcasting2.patch 
Log Message:
gcc#22132# fixed


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.538
retrieving revision 1.539
diff -u -r1.538 -r1.539

--- openoffice.org.spec	11 Nov 2005 09:44:26 -0000	1.538
+++ openoffice.org.spec	11 Nov 2005 10:56:05 -0000	1.539
@@ -159,44 +159,41 @@
 Patch5:  openoffice.org-1.9.121.rh127576.gnomeprintui.patch
 Patch6:  openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
 Patch7:  openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
-Patch8:  openoffice.org-1.9.84.ooo44843.sdcasting.patch
-Patch9:  openoffice.org-1.9.84.ooo44846.svxcasting.patch
-Patch10: openoffice.org-1.9.84.ooo45162.svxcasting2.patch
-Patch11: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
-Patch12: openoffice.org-1.9.87.warnnoterroronmissing.patch
-Patch13: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch
-Patch14: openoffice.org-1.9.89.ooo44027.pthreadchange.patch
-Patch15: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch
-Patch16: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
-Patch17: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch18: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
-Patch19: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
-Patch20: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
-Patch21: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
-Patch22: workspace.oooemailmerge.patch
-Patch23: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
-Patch24: workspace.dbwizardpp1.patch
-Patch25: openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch
-Patch26: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
-Patch27: workspace.javapatch.patch
-Patch28: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch
-Patch29: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch30: openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch
-Patch31: openoffice.org-1.9.125.ooo54586.nfslock.sal.patch
-Patch32: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
-Patch33: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
-Patch34: openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch
-Patch35: workspace.dmake43p01.patch
-Patch36: openoffice.org-1.9.128.ooo54479.systemicu.patch
-Patch37: openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch
-Patch38: openoffice.org-1.9.114.ooo51718.rpath.patch
-Patch39: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
-Patch40: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
-Patch41: workspace.atkbridge.patch
-Patch42: workspace.cmcfixes20.patch
-Patch43: openoffice.org-2.0.0.ooo56536.sw.rtfcrash.patch
-Patch44: workspace.systemlibxmlfix.patch
-Patch45: workspace.jaxpapi.patch
+Patch8:  openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
+Patch9:  openoffice.org-1.9.87.warnnoterroronmissing.patch
+Patch10: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch
+Patch11: openoffice.org-1.9.89.ooo44027.pthreadchange.patch
+Patch12: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch
+Patch13: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
+Patch14: openoffice.org-1.9.129.ooo54603.fontconfig.patch
+Patch15: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
+Patch16: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
+Patch17: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
+Patch18: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
+Patch19: workspace.oooemailmerge.patch
+Patch20: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
+Patch21: workspace.dbwizardpp1.patch
+Patch22: openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch
+Patch23: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
+Patch24: workspace.javapatch.patch
+Patch25: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch
+Patch26: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch27: openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch
+Patch28: openoffice.org-1.9.125.ooo54586.nfslock.sal.patch
+Patch29: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
+Patch30: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
+Patch31: openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch
+Patch32: workspace.dmake43p01.patch
+Patch33: openoffice.org-1.9.128.ooo54479.systemicu.patch
+Patch34: openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch
+Patch35: openoffice.org-1.9.114.ooo51718.rpath.patch
+Patch36: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
+Patch37: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
+Patch38: workspace.atkbridge.patch
+Patch39: workspace.cmcfixes20.patch
+Patch40: openoffice.org-2.0.0.ooo56536.sw.rtfcrash.patch
+Patch41: workspace.systemlibxmlfix.patch
+Patch42: workspace.jaxpapi.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -812,49 +809,46 @@
 %patch6  -p1 -b .rh156677.cripplemenus.sysui.patch
 %endif
 %patch7  -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
-%patch8  -p1 -b .ooo44843.sdcasting.patch
-%patch9  -p1 -b .ooo44846.svxcasting.patch
-%patch10 -p1 -b .ooo45162.svxcasting2.patch
-%patch11 -p1 -b .ooo45725.lingucomponent.contribdict.patch
-%patch12 -p1 -b .warnnoterroronmissing.patch
-%patch13 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch
-%patch14 -p1 -b .ooo44027.pthreadchange.patch
-%patch15 -p1 -b .ooo35641.noxfonts.vcl.patch
-%patch16 -p1 -b .ooo48256.nolongname.sysui.patch
-%patch17 -p1 -b .ooo54603.fontconfig.patch
-%patch18 -p1 -b .ooo44627.sal.brokencondition.patch
-%patch19 -p1 -b .NONE.gcc3gcj4.patch
-%patch20 -p1 -b .ooo9290.goodies.epstoepdf.patch
-%patch21 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
-%patch22 -p1 -b .workspace.oooemailmerge.patch
-%patch23 -p1 -b .ooo51931.systemxmlsec.patch
-%patch24 -p1 -b .workspace.dbwizardpp1.patch
-%patch25 -p1 -b .ooo49720.mozillanspr.extensions.patch
-%patch26 -p1 -b .ooo52428.execshield.bridges.patch
-%patch27 -p1 -b .workspace.javapatch.patch
-%patch28 -p1 -b .ooo52974.systemhsqldbbeanshell.patch
-%patch29 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch30 -p1 -b .ooo53612.systemnp_sdk.extensions.patch
-%patch31 -p1 -b .ooo54586.nfslock.sal.patch
-%patch32 -p1 -b .ooo53723.bulletexport.vcl.patch
-%patch33 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
-%patch34 -p1 -b .ooo54040.savecrash.svtools.patch
-%patch35 -p1 -b .dmake43p01.patch
+%patch8  -p1 -b .ooo45725.lingucomponent.contribdict.patch
+%patch9  -p1 -b .warnnoterroronmissing.patch
+%patch10 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch
+%patch11 -p1 -b .ooo44027.pthreadchange.patch
+%patch12 -p1 -b .ooo35641.noxfonts.vcl.patch
+%patch13 -p1 -b .ooo48256.nolongname.sysui.patch
+%patch14 -p1 -b .ooo54603.fontconfig.patch
+%patch15 -p1 -b .ooo44627.sal.brokencondition.patch
+%patch16 -p1 -b .NONE.gcc3gcj4.patch
+%patch17 -p1 -b .ooo9290.goodies.epstoepdf.patch
+%patch18 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
+%patch19 -p1 -b .workspace.oooemailmerge.patch
+%patch20 -p1 -b .ooo51931.systemxmlsec.patch
+%patch21 -p1 -b .workspace.dbwizardpp1.patch
+%patch22 -p1 -b .ooo49720.mozillanspr.extensions.patch
+%patch23 -p1 -b .ooo52428.execshield.bridges.patch
+%patch24 -p1 -b .workspace.javapatch.patch
+%patch25 -p1 -b .ooo52974.systemhsqldbbeanshell.patch
+%patch26 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch27 -p1 -b .ooo53612.systemnp_sdk.extensions.patch
+%patch28 -p1 -b .ooo54586.nfslock.sal.patch
+%patch29 -p1 -b .ooo53723.bulletexport.vcl.patch
+%patch30 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
+%patch31 -p1 -b .ooo54040.savecrash.svtools.patch
+%patch32 -p1 -b .dmake43p01.patch
 %if ! %{internalicu}
-%patch36 -p1 -b .ooo54479.systemicu.patch
+%patch33 -p1 -b .ooo54479.systemicu.patch
 %endif
-%patch37 -p1 -b .ooo54692.fasterhelpcontent2.patch
+%patch34 -p1 -b .ooo54692.fasterhelpcontent2.patch
 %if %{internaljavabits}
-%patch38 -p1 -b .ooo51718.rpath.patch
+%patch35 -p1 -b .ooo51718.rpath.patch
 %else
-%patch39 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
+%patch36 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
 %endif
-%patch40 -p1 -b .ooo54959.negativeindent.sw.patch
-%patch41 -p1 -b .workspace.atkbridge.patch
-%patch42 -p1 -b .workspace.cmcfixes20.patch
-%patch43 -p1 -b .ooo56536.sw.rtfcrash.patch
-%patch44 -p1 -b .workspace.systemlibxmlfix.patch
-%patch45 -p1 -b .workspace.jaxpapi.patch
+%patch37 -p1 -b .ooo54959.negativeindent.sw.patch
+%patch38 -p1 -b .workspace.atkbridge.patch
+%patch39 -p1 -b .workspace.cmcfixes20.patch
+%patch40 -p1 -b .ooo56536.sw.rtfcrash.patch
+%patch41 -p1 -b .workspace.systemlibxmlfix.patch
+%patch42 -p1 -b .workspace.jaxpapi.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3237,6 +3231,10 @@
 - drop integrated openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
 - openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch -> javapatch
 - drop integrated openoffice.org-1.9.112.ooo53025.exception.package.patch
+- gcc#22132# fixed
+	+ drop openoffice.org-1.9.84.ooo44843.sdcasting.patch
+	+ drop openoffice.org-1.9.84.ooo44846.svxcasting.patch
+	+ drop openoffice.org-1.9.84.ooo45162.svxcasting2.patch
 
 * Wed Nov 08 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-0.138.3
 - fix problem with icu rule searching with null locale


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- sources	11 Nov 2005 09:43:41 -0000	1.129
+++ sources	11 Nov 2005 10:56:05 -0000	1.130
@@ -1,6 +1,5 @@
 a66c6ab52b2eb2deaa7ff85595276b15  GSI_ta-IN.sdf
 176aa81d51a6ed28c5e9a14696a8d208  openoffice.org-jakubicons.tar.gz
-11c0541fa373a327d1c134887ce511e7  openoffice.org-simple-crash_report.sh
 a4a22f6b80a4f02c01bbe0400e131e57  RegisterAndLicence.xcu
 66ee360bd11d33b0ba2283922d853706  opens___.ttf
 f2fc336c9bd7672a13e58d39bbb4553f  GSI_ga.sdf
@@ -8,3 +7,4 @@
 535b25a1e51d4b5ab6b20cbedddf21ce  GSI_hi-IN.sdf
 1825a3b182fd46e08075a42257cfc6aa  gcj-sed.sh
 a1d6f608f48264269fd293f241bc342f  SRC680_m139.tar.bz2
+04819271d356f7885a255617dff421d8  openoffice.org-simple-crash_report.sh


--- openoffice.org-1.9.84.ooo44843.sdcasting.patch DELETED ---


--- openoffice.org-1.9.84.ooo44846.svxcasting.patch DELETED ---


--- openoffice.org-1.9.84.ooo45162.svxcasting2.patch DELETED ---


