rpms/openoffice.org/devel openoffice.org.spec, 1.2101, 1.2102 openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch, 1.1, NONE workspace.fwk132.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch 
	workspace.fwk132.patch 
Log Message:
latest version


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2101
retrieving revision 1.2102
diff -u -p -r1.2101 -r1.2102
--- openoffice.org.spec	17 Dec 2009 09:24:02 -0000	1.2101
+++ openoffice.org.spec	17 Dec 2009 09:28:40 -0000	1.2102
@@ -103,38 +103,36 @@ Patch25: openoffice.org-3.1.0.oooXXXXX.s
 Patch26: ooo-build.ooo2497.filter.svg.patch
 Patch27: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
 Patch28: workspace.slideshow1.patch
-Patch29: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch30: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
-Patch31: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-Patch32: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
-Patch33: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
-Patch34: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
-Patch35: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
-Patch36: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-Patch37: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
-Patch38: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
-Patch39: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
-Patch40: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
-Patch41: workspace.vcl106.patch
-Patch42: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
-Patch43: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
-Patch44: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
-Patch45: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
-Patch46: workspace.gsminhibit.patch
-Patch47: workspace.vcl107.patch
-Patch48: workspace.hb33patches1.patch
-Patch49: workspace.ause109.patch
-Patch50: workspace.cmcfixes67.patch
-Patch51: workspace.srb1.patch
-Patch52: workspace.impress184.patch
-Patch53: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
-Patch54: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
-Patch55: openoffice.org-3.3.0.ooo102645.fix.es.patch
-Patch56: workspace.vcl108.patch
-Patch57: workspace.pythonssldedux.patch
-Patch58: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-Patch59: workspace.fwk132.patch
-Patch60: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
+Patch29: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch30: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch31: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+Patch32: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
+Patch33: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+Patch34: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
+Patch35: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+Patch36: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+Patch37: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
+Patch38: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
+Patch39: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
+Patch40: workspace.vcl106.patch
+Patch41: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
+Patch42: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
+Patch43: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
+Patch44: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
+Patch45: workspace.gsminhibit.patch
+Patch46: workspace.vcl107.patch
+Patch47: workspace.hb33patches1.patch
+Patch48: workspace.ause109.patch
+Patch49: workspace.cmcfixes67.patch
+Patch50: workspace.srb1.patch
+Patch51: workspace.impress184.patch
+Patch52: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
+Patch53: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
+Patch54: openoffice.org-3.3.0.ooo102645.fix.es.patch
+Patch55: workspace.vcl108.patch
+Patch56: workspace.pythonssldedux.patch
+Patch57: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch58: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1632,38 +1630,36 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch26 -p1 -b .ooo2497.filter.svg.patch
 %patch27 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
 %patch28 -p2 -b .workspace.slideshow1.patch
-%patch29 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch30 -p0 -b .ooo101274.opening-a-directory.patch
-%patch31 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
-%patch32 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
-%patch33 -p0 -b .ooo101567.i18npool.mailocaledata.patch
-%patch34 -p0 -b .ooo102061.sc.cellanchoring.patch
-%patch35 -p0 -b .ooo102142.sd.resleak.patch
-%patch36 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-%patch37 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
-%patch38 -p0 -b .ooo104329.dbaccess.primarykeys.patch
-%patch39 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
-%patch40 -p1 -b .oooXXXXXX.sal.justcoredump.patch
-%patch41 -p0 -b .workspace.vcl106.patch
-%patch42 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
-%patch43 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
-%patch44 -p0 -b .ooo105988.svx.a11ycrash.patch
-%patch45 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
-%patch46 -p1 -b .workspace.gsminhibit.patch
-%patch47 -p1 -b .workspace.vcl107.patch
-%patch48 -p0 -b .workspace.hb33patches1.patch
-%patch49 -p0 -b .workspace.ause109.patch
-%patch50 -p1 -b .workspace.cmcfixes67.patch
-%patch51 -p1 -b .workspace.srb1.patch
-%patch52 -p0 -b .workspace.impress184.patch
-%patch53 -p0 -b .ooo107137.canvas.fixcolorspace.patch
-%patch54 -p1 -b .ooo107151.sc.pop-empty-cell.patch
-%patch55 -p0 -b .ooo102645.fix.es.patch
-%patch56 -p0 -b .workspace.vcl108.patch
-%patch57 -p1 -b .workspace.pythonssldedux.patch
-%patch58 -p1 -b .ooo106502.svx.fixspelltimer.patch
-%patch59 -p1 -b .workspace.fwk132.patch
-%patch60 -p0 -b .ooo47279.sd.objectsave.safe.patch
+%patch29 -p0 -b .ooo101274.opening-a-directory.patch
+%patch30 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch31 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
+%patch32 -p0 -b .ooo101567.i18npool.mailocaledata.patch
+%patch33 -p0 -b .ooo102061.sc.cellanchoring.patch
+%patch34 -p0 -b .ooo102142.sd.resleak.patch
+%patch35 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+%patch36 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+%patch37 -p0 -b .ooo104329.dbaccess.primarykeys.patch
+%patch38 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
+%patch39 -p1 -b .oooXXXXXX.sal.justcoredump.patch
+%patch40 -p0 -b .workspace.vcl106.patch
+%patch41 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
+%patch42 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
+%patch43 -p0 -b .ooo105988.svx.a11ycrash.patch
+%patch44 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
+%patch45 -p1 -b .workspace.gsminhibit.patch
+%patch46 -p1 -b .workspace.vcl107.patch
+%patch47 -p0 -b .workspace.hb33patches1.patch
+%patch48 -p0 -b .workspace.ause109.patch
+%patch49 -p1 -b .workspace.cmcfixes67.patch
+%patch50 -p1 -b .workspace.srb1.patch
+%patch51 -p0 -b .workspace.impress184.patch
+%patch52 -p0 -b .ooo107137.canvas.fixcolorspace.patch
+%patch53 -p1 -b .ooo107151.sc.pop-empty-cell.patch
+%patch54 -p0 -b .ooo102645.fix.es.patch
+%patch55 -p0 -b .workspace.vcl108.patch
+%patch56 -p1 -b .workspace.pythonssldedux.patch
+%patch57 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch58 -p0 -b .ooo47279.sd.objectsave.safe.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4168,6 +4164,8 @@ fi
 %changelog
 * Thu Dec 17 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-8.1
 - latest milestone
+- drop integrated openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+- drop integrated workspace.fwk132.patch
 
 * Tue Dec 15 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-7.3
 - Resolves: rhbz#529648 add workspace.fwk132.patch


--- openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch DELETED ---


--- workspace.fwk132.patch DELETED ---