rpms/openoffice.org/devel openoffice.org.spec, 1.837, 1.838 workspace.impress96.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-serv32670

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.impress96.patch 
Log Message:
integrated workspace.impress96


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.837
retrieving revision 1.838
diff -u -r1.837 -r1.838
--- openoffice.org.spec	14 Aug 2006 09:39:43 -0000	1.837
+++ openoffice.org.spec	14 Aug 2006 10:43:34 -0000	1.838
@@ -91,44 +91,39 @@
 Patch23: openoffice.org-2.0.2.rh188467.printingdefaults.patch
 Patch24: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
 Patch25: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch26: workspace.impress96.patch
-Patch27: workspace.fpicker6.patch
-Patch28: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
-Patch29: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch30: workspace.vcl60.patch
-Patch31: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
-Patch32: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
-Patch33: workspace.fwk40.patch
-Patch34: workspace.sixtyfour06.patch
-Patch35: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch36: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch37: workspace.kendy10.patch
-Patch38: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch39: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
-Patch40: ooobuild.VBAObjects.patch
-Patch41: workspace.gcjsix.patch
-Patch42: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
-Patch43: workspace.vcl63.patch
-Patch44: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch45: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
-Patch46: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch47: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch48: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
-Patch49: workspace.pb17.patch
-Patch50: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch51: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
-Patch52: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
-Patch53: workspace.os84.patch
-Patch54: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
-Patch55: workspace.configure18.patch
-Patch56: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch57: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
-Patch58: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
-Patch59: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
-Patch60: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch61: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
-Patch62: openoffice.org-2.0.3.ooo68383.evo28support.patch
-Patch63: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
+Patch26: workspace.fpicker6.patch
+Patch27: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
+Patch28: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch29: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
+Patch30: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
+Patch31: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch32: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch33: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch34: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
+Patch35: ooobuild.VBAObjects.patch
+Patch36: workspace.gcjsix.patch
+Patch37: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
+Patch38: workspace.vcl63.patch
+Patch39: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch40: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+Patch41: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch42: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch43: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
+Patch44: workspace.pb17.patch
+Patch45: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch46: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+Patch47: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
+Patch48: workspace.os84.patch
+Patch49: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
+Patch50: workspace.configure18.patch
+Patch51: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch52: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch53: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+Patch54: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
+Patch55: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch56: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
+Patch57: openoffice.org-2.0.3.ooo68383.evo28support.patch
+Patch58: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -955,44 +950,39 @@
 %patch23 -p1
 %patch24 -p1 -b .ooo64463.extensions.noxaw.patch
 %patch25 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch26 -p1 -b .workspace.impress96.patch
-%patch27 -p1 -b .workspace.fpicker6.patch
-%patch28 -p1 -b .oooXXXXX.atkbroken.vcl.patch
-%patch29 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch30 -p1 -b .workspace.vcl60.patch
-%patch31 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
-%patch32 -p1 -b .rh192588.officecfg.defaultcairooff.patch
-%patch33 -p1 -b .workspace.fwk40.patch
-%patch34 -p1 -b .workspace.sixtyfour06.patch
-%patch35 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch36 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch37 -p1 -b .workspace.kendy10.patch
-%patch38 -p1 -b .rh187919.gtkunderkde.patch
-%patch39 -p1 -b .ooo67186.sw.eventisULONG.patch
-%patch40 -p0 -b .ooobuild.VBAObjects.patch
-%patch41 -p1 -b .workspace.gcjsix.patch
-%patch42 -p1 -b .ooo67644.sw.spacing.patch
-%patch43 -p1 -b .workspace.vcl63.patch
-%patch44 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch45 -p1 -b .ooo67716.svx.overflow.patch
-%patch46 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch47 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch48 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
-%patch49 -p1 -b .workspace.pb17.patch
-%patch50 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch51 -p1 -b .ooo67793.sw.stickymenu.patch
-%patch52 -p1 -b .ooo67829.dtrans.64bitpaste.patch
-%patch53 -p1 -b .workspace.os84.patch
-%patch54 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
-%patch55 -p1 -b .workspace.configure18.patch
-%patch56 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch57 -p1 -b .ooo67976.svx.macroscrash.patch
-%patch58 -p1 -b .ooo68018.svx.classpathdialog.patch
-%patch59 -p1 -b .ooo68047.vcl.zwj.patch
-%patch60 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch61 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
-%patch62 -p1 -b .ooo68383.evo28support.patch
-%patch63 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
+%patch26 -p1 -b .workspace.fpicker6.patch
+%patch27 -p1 -b .oooXXXXX.atkbroken.vcl.patch
+%patch28 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch29 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
+%patch30 -p1 -b .rh192588.officecfg.defaultcairooff.patch
+%patch31 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch32 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch33 -p1 -b .rh187919.gtkunderkde.patch
+%patch34 -p1 -b .ooo67186.sw.eventisULONG.patch
+%patch35 -p0 -b .ooobuild.VBAObjects.patch
+%patch36 -p1 -b .workspace.gcjsix.patch
+%patch37 -p1 -b .ooo67644.sw.spacing.patch
+%patch38 -p1 -b .workspace.vcl63.patch
+%patch39 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch40 -p1 -b .ooo67716.svx.overflow.patch
+%patch41 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch42 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch43 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
+%patch44 -p1 -b .workspace.pb17.patch
+%patch45 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch46 -p1 -b .ooo67793.sw.stickymenu.patch
+%patch47 -p1 -b .ooo67829.dtrans.64bitpaste.patch
+%patch48 -p1 -b .workspace.os84.patch
+%patch49 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
+%patch50 -p1 -b .workspace.configure18.patch
+%patch51 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch52 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch53 -p1 -b .ooo68018.svx.classpathdialog.patch
+%patch54 -p1 -b .ooo68047.vcl.zwj.patch
+%patch55 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch56 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
+%patch57 -p1 -b .ooo68383.evo28support.patch
+%patch58 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
 
 tar xzf %{SOURCE1}
 
@@ -2516,6 +2506,11 @@
 - drop integrated workspace.bfsixtyfour
 - drop integrated workspace.thbpp4
 - drop integrated workspace.vcl59
+- drop integrated workspace.vcl60
+- drop integrated workspace.fwk40
+- drop integrated workspace.sixtyfour06
+- drop integrated workspace.kendy10
+- drop integrated workspace.impress96
 - drop integrated ooo65327.builddep.writerperfect.patch
 
 * Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.9


--- workspace.impress96.patch DELETED ---