rpms/openoffice.org/devel openoffice.org.spec, 1.840, 1.841 workspace.pb17.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-serv11706

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


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.840
retrieving revision 1.841
diff -u -r1.840 -r1.841
--- openoffice.org.spec	14 Aug 2006 11:24:29 -0000	1.840
+++ openoffice.org.spec	14 Aug 2006 11:36:37 -0000	1.841
@@ -106,21 +106,20 @@
 Patch38: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
 Patch39: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
 Patch40: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch41: workspace.pb17.patch
-Patch42: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch43: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
-Patch44: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
-Patch45: workspace.os84.patch
-Patch46: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
-Patch47: workspace.configure18.patch
-Patch48: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch49: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
-Patch50: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
-Patch51: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
-Patch52: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch53: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
-Patch54: openoffice.org-2.0.3.ooo68383.evo28support.patch
-Patch55: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
+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
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -962,21 +961,20 @@
 %patch38 -p1 -b .ooo67716.svx.overflow.patch
 %patch39 -p1 -b .gccXXXXX.basegfx.crash.patch
 %patch40 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch41 -p1 -b .workspace.pb17.patch
-%patch42 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch43 -p1 -b .ooo67793.sw.stickymenu.patch
-%patch44 -p1 -b .ooo67829.dtrans.64bitpaste.patch
-%patch45 -p1 -b .workspace.os84.patch
-%patch46 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
-%patch47 -p1 -b .workspace.configure18.patch
-%patch48 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch49 -p1 -b .ooo67976.svx.macroscrash.patch
-%patch50 -p1 -b .ooo68018.svx.classpathdialog.patch
-%patch51 -p1 -b .ooo68047.vcl.zwj.patch
-%patch52 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch53 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
-%patch54 -p1 -b .ooo68383.evo28support.patch
-%patch55 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
+%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
 
 tar xzf %{SOURCE1}
 


--- workspace.pb17.patch DELETED ---