rpms/openoffice.org/devel openoffice.org.spec, 1.690, 1.691 openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.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-serv3933

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch 
Log Message:
another integrated patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.690
retrieving revision 1.691
diff -u -r1.690 -r1.691
--- openoffice.org.spec	8 May 2006 19:25:52 -0000	1.690
+++ openoffice.org.spec	8 May 2006 20:16:56 -0000	1.691
@@ -215,11 +215,10 @@
 Patch26: openoffice.org-2.0.2.rh188467.printingdefaults.patch
 Patch27: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
 Patch28: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch29: openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch
-Patch30: workspace.bfsixtyfour.patch
-Patch31: openoffice.org-2.0.3.ooo64908.sot.extraqual.patch
-Patch32: openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch
-Patch33: openoffice.org-2.0.3.ooo65052.bridges.makeasmpic.patch
+Patch29: workspace.bfsixtyfour.patch
+Patch30: openoffice.org-2.0.3.ooo64908.sot.extraqual.patch
+Patch31: openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch
+Patch32: openoffice.org-2.0.3.ooo65052.bridges.makeasmpic.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1130,11 +1129,10 @@
 %patch26 -p1
 %patch27 -p1 -b .ooo64463.extensions.noxaw.patch
 %patch28 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch29 -p1 -b .ooo64743.vcl.adjustonlevel1.patch
-%patch30 -p1 -b .workspace.bfsixtyfour.patch
-%patch31 -p1 -b .ooo64908.sot.extraqual.patch
-%patch32 -p1 -b .gccXXXXX.svtools.R_X86_64_PC32.patch
-%patch33 -p1 -b .ooo65052.bridges.makeasmpic.patch
+%patch29 -p1 -b .workspace.bfsixtyfour.patch
+%patch30 -p1 -b .ooo64908.sot.extraqual.patch
+%patch31 -p1 -b .gccXXXXX.svtools.R_X86_64_PC32.patch
+%patch32 -p1 -b .ooo65052.bridges.makeasmpic.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3698,19 +3696,20 @@
 - enable cairo canvas
 - disable useless ldap backend
 - drop integrated workspace.jaxpapi.patch
-- drop integrated openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
-- drop integrated openoffice.org-2.0.2.ooo34909.dbaccess.patch
 - drop integrated workspace.evo2fixes.patch
 - drop integrated workspace.dmake43p01.patch
+- drop integrated workspace.systemjava
+- drop integrated workspace.atkbridge.patch
+- drop integrated openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
+- drop integrated openoffice.org-2.0.2.ooo34909.dbaccess.patch
 - drop integrated openoffice.org-2.0.2.ooo61875.sd.compile.patch
 - drop integrated openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
 - drop integrated openoffice.org-2.0.2.ooo62030.solenv._version.patch
 - 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 integrated openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
-- drop integrated workspace.atkbridge.patch
+- drop integrated openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch
 - drop some integrated dictionary components
 - add workspace.bfsixtyfour.patch
 - add openoffice.org-2.0.3.ooo64908.sot.extraqual.patch


--- openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch DELETED ---