rpms/openoffice.org/devel openoffice.org.spec,1.1952,1.1953

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9395

Modified Files:
	openoffice.org.spec 
Log Message:
drop integrated workspace.sb109.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1952
retrieving revision 1.1953
diff -u -p -r1.1952 -r1.1953
--- openoffice.org.spec	28 Jun 2009 15:52:01 -0000	1.1952
+++ openoffice.org.spec	28 Jun 2009 16:16:14 -0000	1.1953
@@ -109,49 +109,48 @@ Patch31: workspace.mav46.patch
 Patch32: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
 Patch33: workspace.transogl03redux.patch
 Patch34: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
-Patch35: workspace.sb109.patch
-Patch36: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
-Patch37: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch38: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
-Patch39: workspace.cmcfixes54.patch
-Patch40: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch41: workspace.fwk103.patch
-Patch42: workspace.hb18.patch
-Patch43: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
-Patch44: workspace.vcl100.patch
-Patch45: workspace.xmergeclean.patch
-Patch46: workspace.mba32issues02.patch
-Patch47: workspace.impress169.patch
-Patch48: workspace.os130.patch
-Patch49: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
-Patch50: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch51: workspace.cmcfixes57.patch
-Patch52: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
-Patch53: ooo-build.ooo2497.filter.svg.patch
-Patch54: workspace.hb32bugs01.patch
-Patch55: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch56: workspace.impress171.patch
-Patch57: workspace.vcl101.patch
-Patch58: workspace.slideshow1.patch
-Patch59: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch60: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
-Patch61: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-Patch62: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
-Patch63: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
-Patch64: workspace.evoab2def.patch
-Patch65: openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch
-Patch66: openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch
-Patch67: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
-Patch68: workspace.unifypaper01.patch
-Patch69: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
-Patch70: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
-Patch71: workspace.calc51.patch
-Patch72: openoffice.org-3.1.1-ooo102679.sdext.buildfix.patch
-Patch73: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-Patch74: openoffice.org-3.1.0.ooo102920.i18npool.utf16bustage.patch
-Patch75: workspace.aw073.patch
-Patch76: openoffice.org-3.1.1.ooo102932.sw.mailmerge.busted-integer-conversion.patch
-Patch77: openoffice.org-3.1.0.ooo92645.oox.msxmldecryptimpl.patch
+Patch35: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
+Patch36: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+Patch37: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+Patch38: workspace.cmcfixes54.patch
+Patch39: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch40: workspace.fwk103.patch
+Patch41: workspace.hb18.patch
+Patch42: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
+Patch43: workspace.vcl100.patch
+Patch44: workspace.xmergeclean.patch
+Patch45: workspace.mba32issues02.patch
+Patch46: workspace.impress169.patch
+Patch47: workspace.os130.patch
+Patch48: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
+Patch49: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+Patch50: workspace.cmcfixes57.patch
+Patch51: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
+Patch52: ooo-build.ooo2497.filter.svg.patch
+Patch53: workspace.hb32bugs01.patch
+Patch54: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch55: workspace.impress171.patch
+Patch56: workspace.vcl101.patch
+Patch57: workspace.slideshow1.patch
+Patch58: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch59: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch60: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch61: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+Patch62: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
+Patch63: workspace.evoab2def.patch
+Patch64: openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch
+Patch65: openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch
+Patch66: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
+Patch67: workspace.unifypaper01.patch
+Patch68: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+Patch69: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
+Patch70: workspace.calc51.patch
+Patch71: openoffice.org-3.1.1-ooo102679.sdext.buildfix.patch
+Patch72: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+Patch73: openoffice.org-3.1.0.ooo102920.i18npool.utf16bustage.patch
+Patch74: workspace.aw073.patch
+Patch75: openoffice.org-3.1.1.ooo102932.sw.mailmerge.busted-integer-conversion.patch
+Patch76: openoffice.org-3.1.0.ooo92645.oox.msxmldecryptimpl.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1618,49 +1617,48 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch32 -p1
 %patch33 -p0 -b .workspace.transogl03redux.patch
 %patch34 -p1 -b .oooXXXXX.extensions.npapi.patch
-%patch35 -p1 -b .workspace.sb109.patch
-%patch36 -p1 -b .ooo97488.sw.ww8toc.patch
-%patch37 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch38 -p0 -b .ooo98137.filter.redeclared-variables.patch
-%patch39 -p1 -b .workspace.cmcfixes54.patch
-%patch40 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch41 -p1 -b .workspace.fwk103.patch
-%patch42 -p0 -b .workspace.hb18.patch
-%patch43 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
-%patch44 -p0 -b .workspace.vcl100.patch
-%patch45 -p0 -b .workspace.xmergeclean.patch
-%patch46 -p0 -b .workspace.mba32issues02.patch
-%patch47 -p0 -b .workspace.impress169.patch
-%patch48 -p0 -b .workspace.os130.patch
-%patch49 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
-%patch50 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch51 -p0 -b .workspace.cmcfixes57.patch
-%patch52 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
-%patch53 -p1 -b .ooo2497.filter.svg.patch
-%patch54 -p0 -b .workspace.hb32bugs01.patch
-%patch55 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch56 -p1 -b .workspace.impress171.patch
-%patch57 -p1 -b .workspace.vcl101.patch
-%patch58 -p2 -b .workspace.slideshow1.patch
-%patch59 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch60 -p0 -b .ooo101274.opening-a-directory.patch
-%patch61 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
-%patch62 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
-%patch63 -p0 -b .ooo101379.vcl.qstart.SM.patch
-%patch64 -p0 -b .workspace.evoab2def.patch
-%patch65 -p0 -b .ooo100469.sal.ia64_arm.patch
-%patch66 -p0 -b .ooo101566.svtools.nodefaultwmfwidth.patch
-%patch67 -p0 -b .ooo101567.i18npool.mailocaledata.patch
-%patch68 -p1
-%patch69 -p0 -b .ooo102061.sc.cellanchoring.patch
-%patch70 -p0 -b .ooo102142.sd.resleak.patch
-%patch71 -p0 -b .workspace.calc51.patch
-%patch72 -p0 -b .ooo102679.sdext.buildfix.patch
-%patch73 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-%patch74 -p0 -b .ooo102920.i18npool.utf16bustage.patch
-%patch75 -p0 -b .workspace.aw073.patch
-%patch76 -p0 -b .ooo102932.sw.mailmerge.busted-integer-conversion.patch
-%patch77 -p0 -b .ooo92645.oox.msxmldecryptimpl.patch
+%patch35 -p1 -b .ooo97488.sw.ww8toc.patch
+%patch36 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
+%patch37 -p0 -b .ooo98137.filter.redeclared-variables.patch
+%patch38 -p1 -b .workspace.cmcfixes54.patch
+%patch39 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch40 -p1 -b .workspace.fwk103.patch
+%patch41 -p0 -b .workspace.hb18.patch
+%patch42 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
+%patch43 -p0 -b .workspace.vcl100.patch
+%patch44 -p0 -b .workspace.xmergeclean.patch
+%patch45 -p0 -b .workspace.mba32issues02.patch
+%patch46 -p0 -b .workspace.impress169.patch
+%patch47 -p0 -b .workspace.os130.patch
+%patch48 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
+%patch49 -p1 -b .oooXXXXX.solenv.allowmissing.patch
+%patch50 -p0 -b .workspace.cmcfixes57.patch
+%patch51 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
+%patch52 -p1 -b .ooo2497.filter.svg.patch
+%patch53 -p0 -b .workspace.hb32bugs01.patch
+%patch54 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch55 -p1 -b .workspace.impress171.patch
+%patch56 -p1 -b .workspace.vcl101.patch
+%patch57 -p2 -b .workspace.slideshow1.patch
+%patch58 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch59 -p0 -b .ooo101274.opening-a-directory.patch
+%patch60 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch61 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
+%patch62 -p0 -b .ooo101379.vcl.qstart.SM.patch
+%patch63 -p0 -b .workspace.evoab2def.patch
+%patch64 -p0 -b .ooo100469.sal.ia64_arm.patch
+%patch65 -p0 -b .ooo101566.svtools.nodefaultwmfwidth.patch
+%patch66 -p0 -b .ooo101567.i18npool.mailocaledata.patch
+%patch67 -p1
+%patch68 -p0 -b .ooo102061.sc.cellanchoring.patch
+%patch69 -p0 -b .ooo102142.sd.resleak.patch
+%patch70 -p0 -b .workspace.calc51.patch
+%patch71 -p0 -b .ooo102679.sdext.buildfix.patch
+%patch72 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+%patch73 -p0 -b .ooo102920.i18npool.utf16bustage.patch
+%patch74 -p0 -b .workspace.aw073.patch
+%patch75 -p0 -b .ooo102932.sw.mailmerge.busted-integer-conversion.patch
+%patch76 -p0 -b .ooo92645.oox.msxmldecryptimpl.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4178,6 +4176,7 @@ fi
 - implement MSXML decryption, no querying for passwords though, so
   only currently opens "protected" .xlsx documents which are 
   encrypted with excels default password
+- drop integrated workspace.sb109.patch
 - next milestone
 
 * Mon Jun 22 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-13.3