rpms/openoffice.org/devel openoffice.org.spec, 1.841, 1.842 workspace.os84.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-serv31987

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


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.841
retrieving revision 1.842
diff -u -r1.841 -r1.842
--- openoffice.org.spec	14 Aug 2006 11:36:37 -0000	1.841
+++ openoffice.org.spec	14 Aug 2006 11:52:25 -0000	1.842
@@ -109,17 +109,16 @@
 Patch41: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
 Patch42: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
 Patch43: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
-Patch44: workspace.os84.patch
-Patch45: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
-Patch46: workspace.configure18.patch
-Patch47: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch48: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
-Patch49: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
-Patch50: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
-Patch51: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch52: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
-Patch53: openoffice.org-2.0.3.ooo68383.evo28support.patch
-Patch54: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
+Patch44: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
+Patch45: workspace.configure18.patch
+Patch46: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch47: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch48: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+Patch49: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
+Patch50: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch51: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
+Patch52: openoffice.org-2.0.3.ooo68383.evo28support.patch
+Patch53: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -964,17 +963,16 @@
 %patch41 -p1 -b .rh200118.filter.xalanbroken.patch
 %patch42 -p1 -b .ooo67793.sw.stickymenu.patch
 %patch43 -p1 -b .ooo67829.dtrans.64bitpaste.patch
-%patch44 -p1 -b .workspace.os84.patch
-%patch45 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
-%patch46 -p1 -b .workspace.configure18.patch
-%patch47 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch48 -p1 -b .ooo67976.svx.macroscrash.patch
-%patch49 -p1 -b .ooo68018.svx.classpathdialog.patch
-%patch50 -p1 -b .ooo68047.vcl.zwj.patch
-%patch51 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch52 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
-%patch53 -p1 -b .ooo68383.evo28support.patch
-%patch54 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
+%patch44 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
+%patch45 -p1 -b .workspace.configure18.patch
+%patch46 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch47 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch48 -p1 -b .ooo68018.svx.classpathdialog.patch
+%patch49 -p1 -b .ooo68047.vcl.zwj.patch
+%patch50 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch51 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
+%patch52 -p1 -b .ooo68383.evo28support.patch
+%patch53 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
 
 tar xzf %{SOURCE1}
 
@@ -2505,6 +2503,7 @@
 - drop integrated workspace.impress96
 - drop integrated workspace.gcjsix
 - drop integrated workspace.vcl63
+- drop integrated workspace.os84
 - drop integrated ooo65327.builddep.writerperfect.patch
 - drop integrated ooo67337.sfx2.dontshowbuttons.patch
 


--- workspace.os84.patch DELETED ---