rpms/openoffice.org/devel openoffice.org.spec, 1.682, 1.683 workspace.systemjava2.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-serv532

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.systemjava2.patch 
Log Message:
workspace.systemjava2 now in


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.682
retrieving revision 1.683
diff -u -r1.682 -r1.683
--- openoffice.org.spec	5 May 2006 10:49:39 -0000	1.682
+++ openoffice.org.spec	5 May 2006 11:03:28 -0000	1.683
@@ -201,30 +201,29 @@
 Patch18: openoffice.org-1.9.128.ooo54479.systemicu.patch
 Patch19: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
 Patch20: workspace.atkbridge.patch
-Patch21: workspace.systemjava2.patch
 %if ! %{internaljavabits}
-Patch22: workspace.targetedaot.patch
+Patch21: workspace.targetedaot.patch
 %else
-Patch22: openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch
+Patch21: openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch
 %endif
-Patch23: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
-Patch24: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch25: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
-Patch26: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
+Patch22: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
+Patch23: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch24: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
+Patch25: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
 %if %{build_rhel4}
-Patch27: openoffice.org-1.9.74.ArchiveZip.patch
-Patch28: openoffice.org-2.0.1.gij4ant.patch
+Patch26: openoffice.org-1.9.74.ArchiveZip.patch
+Patch27: openoffice.org-2.0.1.gij4ant.patch
 %endif
-Patch29: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch30: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
-Patch31: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch32: openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch
-Patch33: workspace.bfsixtyfour.patch
-Patch34: workspace.impress93.patch
-Patch35: openoffice.org-2.0.3.ooo64908.sot.extraqual.patch
-Patch36: openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch
-Patch37: workspace.sfxcleanup.patch
-Patch38: openoffice.org-2.0.3.ooo65052.bridges.makeasmpic.patch
+Patch28: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch29: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
+Patch30: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch31: openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch
+Patch32: workspace.bfsixtyfour.patch
+Patch33: workspace.impress93.patch
+Patch34: openoffice.org-2.0.3.ooo64908.sot.extraqual.patch
+Patch35: openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch
+Patch36: workspace.sfxcleanup.patch
+Patch37: openoffice.org-2.0.3.ooo65052.bridges.makeasmpic.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1115,34 +1114,33 @@
 %endif
 %patch19 -p1 -b .ooo54959.negativeindent.sw.patch
 %patch20 -p1 -b .workspace.atkbridge.patch
-%patch21 -p1 -b .workspace.systemjava2.patch
 %if ! %{internaljavabits}
-%patch22 -p1 -b .workspace.targetedaot.patch
+%patch21 -p1 -b .workspace.targetedaot.patch
 %else
-%patch22 -p1 -b .rhXXXXX.helpcontent2.baddb.patch
+%patch21 -p1 -b .rhXXXXX.helpcontent2.baddb.patch
 %endif
-%patch23 -p1 -b .ooo58663.vcl.missingglyph.patch
-%patch24 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch25 -p1 -b .ooo59997.sw.defaultbullets.patch
-%patch26 -p1 -b .ooo19976.framework.nofocussteal.patch
+%patch22 -p1 -b .ooo58663.vcl.missingglyph.patch
+%patch23 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch24 -p1 -b .ooo59997.sw.defaultbullets.patch
+%patch25 -p1 -b .ooo19976.framework.nofocussteal.patch
 %if %{build_rhel4}
-%patch27 -p1 -b .rhXXXXXX.config_office.archivezip.patch
+%patch26 -p1 -b .rhXXXXXX.config_office.archivezip.patch
 tar xjf %{SOURCE12}
-%patch28 -p0 -b .gij4ant.patch
+%patch27 -p0 -b .gij4ant.patch
 cd solenv/bin
 tar xzf %{SOURCE13} Archive-Zip-1.13/lib
 cd ../..
 %endif
-%patch29 -p1
-%patch30 -p1 -b .ooo64463.extensions.noxaw.patch
-%patch31 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch32 -p1 -b .ooo64743.vcl.adjustonlevel1.patch
-%patch33 -p1 -b .workspace.bfsixtyfour.patch
-%patch34 -p1 -b .workspace.impress93.patch
-%patch35 -p1 -b .ooo64908.sot.extraqual.patch
-%patch36 -p1 -b .gccXXXXX.svtools.R_X86_64_PC32.patch
-%patch37 -p1 -b .workspace.sfxcleanup.patch
-%patch38 -p1 -b .ooo65052.bridges.makeasmpic.patch
+%patch28 -p1
+%patch29 -p1 -b .ooo64463.extensions.noxaw.patch
+%patch30 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch31 -p1 -b .ooo64743.vcl.adjustonlevel1.patch
+%patch32 -p1 -b .workspace.bfsixtyfour.patch
+%patch33 -p1 -b .workspace.impress93.patch
+%patch34 -p1 -b .ooo64908.sot.extraqual.patch
+%patch35 -p1 -b .gccXXXXX.svtools.R_X86_64_PC32.patch
+%patch36 -p1 -b .workspace.sfxcleanup.patch
+%patch37 -p1 -b .ooo65052.bridges.makeasmpic.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3715,8 +3713,8 @@
 - drop integrated openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch
 - drop integrated openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch
 - drop integrated openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
+- drop integrated workspace.systemjava
 - drop some integrated dictionary components
-- workspace.systemjava -> workspace.systemjava2
 - add workspace.bfsixtyfour.patch
 - add workspace.impress93.patch
 - add openoffice.org-2.0.3.ooo64908.sot.extraqual.patch


--- workspace.systemjava2.patch DELETED ---