rpms/openoffice.org/devel openoffice.org.spec, 1.1867, 1.1868 openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch, 1.3, NONE
Caolan McNamara
caolanm at fedoraproject.org
Sat Mar 28 17:09:16 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2568
Modified Files:
openoffice.org.spec
Removed Files:
openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch
Log Message:
drop openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1867
retrieving revision 1.1868
diff -u -r1.1867 -r1.1868
--- openoffice.org.spec 28 Mar 2009 16:26:37 -0000 1.1867
+++ openoffice.org.spec 28 Mar 2009 17:08:46 -0000 1.1868
@@ -74,63 +74,62 @@
%if %{gtkprintui}
Patch3: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
%endif
-Patch4: openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch
-Patch5: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
-Patch6: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch7: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch8: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch9: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch10: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch11: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch4: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
+Patch5: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch6: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch7: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch8: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch9: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch10: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
%if %{gtkprintui}
-Patch12: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch11: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
%endif
-Patch13: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch14: ooo-build.ooo68717.gstreamer.video.patch
-Patch15: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch16: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch17: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
-Patch18: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch19: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch20: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch21: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch22: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch23: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch24: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch25: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch26: workspace.tl66.patch
-Patch27: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
-Patch28: workspace.mhu17.patch
-Patch29: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
-Patch30: workspace.gtkmenuimages.patch
-Patch31: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
-Patch32: workspace.mav46.patch
-Patch33: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
-Patch34: workspace.transogl03redux.patch
-Patch35: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
-Patch36: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
-Patch37: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
-Patch38: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch39: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
-Patch40: workspace.cmcfixes54.patch
-Patch41: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch42: workspace.fwk103.patch
-Patch43: openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
-Patch44: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
-Patch45: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
-Patch46: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
-Patch47: workspace.vcl100.patch
-Patch48: workspace.xmergeclean.patch
-Patch49: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
-Patch50: workspace.impress169.patch
-Patch51: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
-Patch52: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
-Patch53: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
-Patch54: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch55: openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch
-Patch56: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
-Patch57: ooo-build.ooo2497.filter.svg.patch
-Patch58: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
+Patch12: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch13: ooo-build.ooo68717.gstreamer.video.patch
+Patch14: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch15: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch16: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
+Patch17: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch18: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch19: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch20: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch21: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch22: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch23: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch24: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch25: workspace.tl66.patch
+Patch26: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
+Patch27: workspace.mhu17.patch
+Patch28: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
+Patch29: workspace.gtkmenuimages.patch
+Patch30: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
+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: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.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: openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
+Patch43: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
+Patch44: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
+Patch45: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
+Patch46: workspace.vcl100.patch
+Patch47: workspace.xmergeclean.patch
+Patch48: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
+Patch49: workspace.impress169.patch
+Patch50: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
+Patch51: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
+Patch52: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
+Patch53: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+Patch54: openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch
+Patch55: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
+Patch56: ooo-build.ooo2497.filter.svg.patch
+Patch57: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1563,63 +1562,62 @@
%if %{gtkprintui}
%patch3 -p1 -b .rh127576.gtkunixprintdialog.patch
%endif
-%patch4 -p1 -b .ooo83140.jvmfwk.retryjvm.patch
-%patch5 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
-%patch6 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch7 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch8 -p1
-%patch9 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch10 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch11 -p1 -b .ooo65491.psprint.enablenups.patch
+%patch4 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
+%patch5 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch6 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch7 -p1
+%patch8 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch9 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch10 -p1 -b .ooo65491.psprint.enablenups.patch
%if %{gtkprintui}
-cat %{PATCH12} >> svtools/source/dialogs/localize.sdf
+cat %{PATCH11} >> svtools/source/dialogs/localize.sdf
%endif
-%patch13 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch14 -p0 -b .ooo68717.gstreamer.video.patch
-%patch15 -p1 -b .ooo63159.sal.dtype.patch
-%patch16 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch17 -p1 -b .ooo7065.sw.titlepagedialog.patch
-%patch18 -p1 -b .ooo76649.httpencoding.patch
-%patch19 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch20 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch21 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch22 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch23 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch24 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch25 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch26 -p1 -b .workspace.tl66.patch
-%patch27 -p1 -b .ooo91924.svx.consistentordering.patch
-%patch28 -p1 -b .workspace.mhu17.patch
-%patch29 -p1 -b .ooo95018.sal.fdwarnings.patch
-%patch30 -p0 -b .workspace.gtkmenuimages.patch
-%patch31 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
-%patch32 -p1 -b .workspace.mav46.patch
-%patch33 -p1
-%patch34 -p0 -b .workspace.transogl03redux.patch
-%patch35 -p1 -b .oooXXXXX.extensions.npapi.patch
-%patch36 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
-%patch37 -p1 -b .ooo97488.sw.ww8toc.patch
-%patch38 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch39 -p1 -b .ooo98137.filter.redeclared-variables.patch
-%patch40 -p1 -b .workspace.cmcfixes54.patch
-%patch41 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch42 -p1 -b .workspace.fwk103.patch
-%patch43 -p1 -b .ooo98885.sw.safeindex.patch
-%patch44 -p1 -R -b .ooo99050.sw.htmlload.patch
-%patch45 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
-%patch46 -p0 -b .ooo99250.sc.autooutline-reflists.patch
-%patch47 -p0 -b .workspace.vcl100.patch
-%patch48 -p0 -b .workspace.xmergeclean.patch
-%patch49 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
-%patch50 -p0 -b .workspace.impress169.patch
-%patch51 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch
-%patch52 -p0 -b .ooo99529.sw.notrailingnewline.patch
-%patch53 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
-%patch54 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch55 -p1 -b .gccXXXXX.sw.typeillness.patch
-%patch56 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
-%patch57 -p1 -b .ooo2497.filter.svg.patch
-%patch58 -p0 -b .ooo100353.svx.rtfbrackets.patch
+%patch12 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch13 -p0 -b .ooo68717.gstreamer.video.patch
+%patch14 -p1 -b .ooo63159.sal.dtype.patch
+%patch15 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch16 -p1 -b .ooo7065.sw.titlepagedialog.patch
+%patch17 -p1 -b .ooo76649.httpencoding.patch
+%patch18 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch19 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch20 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch21 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch22 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch23 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch24 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch25 -p1 -b .workspace.tl66.patch
+%patch26 -p1 -b .ooo91924.svx.consistentordering.patch
+%patch27 -p1 -b .workspace.mhu17.patch
+%patch28 -p1 -b .ooo95018.sal.fdwarnings.patch
+%patch29 -p0 -b .workspace.gtkmenuimages.patch
+%patch30 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
+%patch31 -p1 -b .workspace.mav46.patch
+%patch32 -p1
+%patch33 -p0 -b .workspace.transogl03redux.patch
+%patch34 -p1 -b .oooXXXXX.extensions.npapi.patch
+%patch35 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
+%patch36 -p1 -b .ooo97488.sw.ww8toc.patch
+%patch37 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
+%patch38 -p1 -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 -p1 -b .ooo98885.sw.safeindex.patch
+%patch43 -p1 -R -b .ooo99050.sw.htmlload.patch
+%patch44 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
+%patch45 -p0 -b .ooo99250.sc.autooutline-reflists.patch
+%patch46 -p0 -b .workspace.vcl100.patch
+%patch47 -p0 -b .workspace.xmergeclean.patch
+%patch48 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
+%patch49 -p0 -b .workspace.impress169.patch
+%patch50 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch
+%patch51 -p0 -b .ooo99529.sw.notrailingnewline.patch
+%patch52 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
+%patch53 -p1 -b .oooXXXXX.solenv.allowmissing.patch
+%patch54 -p1 -b .gccXXXXX.sw.typeillness.patch
+%patch55 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
+%patch56 -p1 -b .ooo2497.filter.svg.patch
+%patch57 -p0 -b .ooo100353.svx.rtfbrackets.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4110,6 +4108,7 @@
* Sat Mar 28 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-8.1
- latest version
- add mythes-nl as requires to Dutch langpack
+- drop integrated openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch
* Mon Mar 23 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-7.1
- drop integrated workspace.rptfix06.patch
--- openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch DELETED ---
More information about the fedora-extras-commits
mailing list