rpms/openoffice.org/devel openoffice.org.spec, 1.979, 1.980 openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch, 1.1, NONE openoffice.org-2.0.4.gccXXXXX.svtools.fsstorage.patch, 1.1, NONE openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch, 1.2, NONE

Tue Dec 19 09:24:47 UTC 2006

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch 
	openoffice.org-2.0.4.gccXXXXX.svtools.fsstorage.patch 
	openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch 
Log Message:
let's try and drop the gcc workarounds


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.979
retrieving revision 1.980
diff -u -r1.979 -r1.980

--- openoffice.org.spec	18 Dec 2006 16:12:51 -0000	1.979
+++ openoffice.org.spec	19 Dec 2006 09:24:44 -0000	1.980
@@ -96,41 +96,39 @@
 Patch28: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 Patch29: ooobuild.VBAObjects.patch
 Patch30: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch31: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch32: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch33: workspace.os89.patch
-Patch34: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch35: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch36: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
-Patch37: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
-Patch38: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch39: pseudoworkspace.valgrind1.patch
-Patch40: openoffice.org-2.0.4.gccXXXXX.svtools.fsstorage.patch
-Patch41: workspace.thbpp6.patch
-Patch42: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch43: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch44: openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch
-Patch45: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
-Patch46: workspace.aw024.patch
-Patch47: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
-Patch48: workspace.dr51.patch
-Patch49: openoffice.org-1.9.129.ooo54603.fontconfig.part4.patch
-Patch50: openoffice.org-2.0.4.rh213710.vba.patch
-Patch51: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch52: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
-Patch53: workspace.sixtyfour09.patch
-Patch54: workspace.vcl69.patch
-Patch55: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch56: workspace.dba22b.patch
-Patch57: workspace.sixtyfour10.patch
-Patch58: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
-Patch59: visibility.warning.patch
-Patch60: workspace.vcl70.patch
-Patch61: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
-Patch62: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch63: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch64: openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch
-Patch65: workspace.vcl71.patch
+Patch31: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch32: workspace.os89.patch
+Patch33: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch34: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch35: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
+Patch36: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
+Patch37: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch38: pseudoworkspace.valgrind1.patch
+Patch39: workspace.thbpp6.patch
+Patch40: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch41: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch42: openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch
+Patch43: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
+Patch44: workspace.aw024.patch
+Patch45: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
+Patch46: workspace.dr51.patch
+Patch47: openoffice.org-1.9.129.ooo54603.fontconfig.part4.patch
+Patch48: openoffice.org-2.0.4.rh213710.vba.patch
+Patch49: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch50: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
+Patch51: workspace.sixtyfour09.patch
+Patch52: workspace.vcl69.patch
+Patch53: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch54: workspace.dba22b.patch
+Patch55: workspace.sixtyfour10.patch
+Patch56: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
+Patch57: visibility.warning.patch
+Patch58: workspace.vcl70.patch
+Patch59: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
+Patch60: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch61: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch62: openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch
+Patch63: workspace.vcl71.patch
 
 %define instdir %{_libdir}/openoffice.org2.1
 
@@ -964,41 +962,39 @@
 %patch28 -p1 -b .rh187919.gtkunderkde.patch
 %patch29 -p0 -b .ooobuild.VBAObjects.patch
 %patch30 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch31 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch32 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch33 -p1 -b .workspace.os89.patch
-%patch34 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch35 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch36 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
-%patch37 -p1 -b .ooo54603.fontconfig.part3.patch
-%patch38 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch39 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch40 -p1 -b .gccXXXXX.svtools.fsstorage.patch
-%patch41 -p1 -b .workspace.thbpp6.patch
-%patch42 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch43 -p1 -b .rh217065.syncbackspace.patch
-%patch44 -p1 -b .ooo70779.vcl.setprgname.patch
-%patch45 -p1 -b .ooo70155.fasterhelplinking.patch
-%patch46 -p1 -b .workspace.aw024.patch
-%patch47 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
-%patch48 -p1 -b .workspace.dr51.patch
-%patch49 -p1 -b .ooo54603.fontconfig.part4.patch
-%patch50 -p1 -b .rh213710.vba.patch
-%patch51 -p1 -b .ooo65491.psprint.enablenups.patch
-%patch52 -p1 -b .ooo61812.svx.a11ycrash.patch
-%patch53 -p1 -b .workspace.sixtyfour09.patch
-%patch54 -p1 -b .workspace.vcl69.patch
-cat %{PATCH55} >> svtools/source/dialogs/localize.sdf
-%patch56 -p1 -b .workspace.dba22b.patch
-%patch57 -p1 -b .workspace.sixtyfour10.patch
-%patch58 -p1 -b .ooo72014.officecfg.malayammenu.patch
-%patch59 -p1 -b .visibility.warning.patch
-%patch60 -p1 -b .workspace.vcl70.patch
-%patch61 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
-%patch62 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch63 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch64 -p1 -b .oooXXXXX.vcl.filterzwatrender.patch
-%patch65 -p1 -b .workspace.vcl71.patch
+%patch31 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch32 -p1 -b .workspace.os89.patch
+%patch33 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch34 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch35 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
+%patch36 -p1 -b .ooo54603.fontconfig.part3.patch
+%patch37 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch38 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch39 -p1 -b .workspace.thbpp6.patch
+%patch40 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch41 -p1 -b .rh217065.syncbackspace.patch
+%patch42 -p1 -b .ooo70779.vcl.setprgname.patch
+%patch43 -p1 -b .ooo70155.fasterhelplinking.patch
+%patch44 -p1 -b .workspace.aw024.patch
+%patch45 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
+%patch46 -p1 -b .workspace.dr51.patch
+%patch47 -p1 -b .ooo54603.fontconfig.part4.patch
+%patch48 -p1 -b .rh213710.vba.patch
+%patch49 -p1 -b .ooo65491.psprint.enablenups.patch
+%patch50 -p1 -b .ooo61812.svx.a11ycrash.patch
+%patch51 -p1 -b .workspace.sixtyfour09.patch
+%patch52 -p1 -b .workspace.vcl69.patch
+cat %{PATCH53} >> svtools/source/dialogs/localize.sdf
+%patch54 -p1 -b .workspace.dba22b.patch
+%patch55 -p1 -b .workspace.sixtyfour10.patch
+%patch56 -p1 -b .ooo72014.officecfg.malayammenu.patch
+%patch57 -p1 -b .visibility.warning.patch
+%patch58 -p1 -b .workspace.vcl70.patch
+%patch59 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
+%patch60 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch61 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch62 -p1 -b .oooXXXXX.vcl.filterzwatrender.patch
+%patch63 -p1 -b .workspace.vcl71.patch
 
 %if %{langpacks}
 tar xzf %{SOURCE1}
@@ -2586,6 +2582,9 @@
 * Mon Dec 18 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-6.8
 - rename and appropiately merge commited patches as their respective workspaces
 - drop rh200118.filter.xalanbroken.patch
+- try and drop
+	+ openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+	+ openoffice.org-2.0.4.gccXXXXX.svtools.fsstorage.patch
 
 * Wed Dec 13 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-6.7
 - split out english dictionaries into hunspell-en


--- openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch DELETED ---


--- openoffice.org-2.0.4.gccXXXXX.svtools.fsstorage.patch DELETED ---


--- openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch DELETED ---


