rpms/openoffice.org/devel openoffice.org.spec, 1.1818, 1.1819 workspace.fwk102.patch, 1.1, NONE workspace.mba31issues01.patch, 1.1, NONE

Caolan McNamara caolanm at fedoraproject.org
Fri Feb 20 14:49:18 UTC 2009 

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.fwk102.patch workspace.mba31issues01.patch 
Log Message:
next milestone


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1818
retrieving revision 1.1819
diff -u -r1.1818 -r1.1819
--- openoffice.org.spec	19 Feb 2009 23:51:10 -0000	1.1818
+++ openoffice.org.spec	20 Feb 2009 14:48:48 -0000	1.1819
@@ -93,40 +93,38 @@
 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: workspace.mba31issues01.patch
-Patch24: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch25: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch26: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch27: workspace.tl66.patch
-Patch28: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
-Patch29: workspace.jl115.patch
-Patch30: workspace.mhu17.patch
-Patch31: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
-Patch32: workspace.gtkmenuimages.patch
-Patch33: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
-Patch34: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
-Patch35: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
-Patch36: workspace.transogl03redux.patch
-Patch37: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
-Patch38: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
-Patch39: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
-Patch40: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch41: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
-Patch42: workspace.fwk102.patch
-Patch43: workspace.cmcfixes54.patch
-Patch44: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch45: openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
-Patch46: openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
-Patch47: openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch
-Patch48: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
-Patch49: workspace.gfbcrash.patch
-Patch50: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
-Patch51: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
-Patch52: workspace.ooo31gsl2.patch
-Patch53: workspace.vcl100.patch
-Patch54: workspace.xmergeclean.patch
-Patch55: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
-Patch56: openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.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.jl115.patch
+Patch29: workspace.mhu17.patch
+Patch30: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
+Patch31: workspace.gtkmenuimages.patch
+Patch32: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
+Patch33: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
+Patch34: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
+Patch35: workspace.transogl03redux.patch
+Patch36: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
+Patch37: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
+Patch38: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
+Patch39: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+Patch40: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+Patch41: workspace.cmcfixes54.patch
+Patch42: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch43: openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
+Patch44: openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
+Patch45: openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch
+Patch46: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
+Patch47: workspace.gfbcrash.patch
+Patch48: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
+Patch49: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
+Patch50: workspace.ooo31gsl2.patch
+Patch51: workspace.vcl100.patch
+Patch52: workspace.xmergeclean.patch
+Patch53: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
+Patch54: openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1554,40 +1552,38 @@
 %patch20 -p1 -b .rh133741.alwaysgtk.vcl.patch
 %patch21 -p1 -b .ooo85921.sd.editmasterundermouse.patch
 %patch22 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch23 -p1 -b .workspace.mba31issues01.patch
-%patch24 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch25 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch26 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch27 -p1 -b .workspace.tl66.patch
-%patch28 -p1 -b .ooo91924.svx.consistentordering.patch
-%patch29 -p1 -b .workspace.jl115.patch
-%patch30 -p1 -b .workspace.mhu17.patch
-%patch31 -p1 -b .ooo95018.sal.fdwarnings.patch
-%patch32 -p0 -b .workspace.gtkmenuimages.patch
-%patch33 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
-%patch34 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
-%patch35 -p1
-%patch36 -p0 -b .workspace.transogl03redux.patch
-%patch37 -p1 -b .oooXXXXX.extensions.npapi.patch
-%patch38 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
-%patch39 -p1 -b .ooo97488.sw.ww8toc.patch
-%patch40 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch41 -p1 -b .ooo98137.filter.redeclared-variables.patch
-%patch42 -p1 -b .workspace.fwk102.patch
-%patch43 -p1 -b .workspace.cmcfixes54.patch
-%patch44 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch45 -p1 -b .ooo98649.svtools.missingUI.patch
-%patch46 -p1 -b .ooo98885.sw.safeindex.patch
-%patch47 -p1 -b .ooo98909.sfx2.missingplugins.patch
-%patch48 -p1 -R -b .ooo99050.sw.htmlload.patch
-%patch49 -p0 -b .workspace.gfbcrash.patch
-%patch50 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
-%patch51 -p0 -b .ooo99250.sc.autooutline-reflists.patch
-%patch52 -p0 -b .workspace.ooo31gsl2.patch
-%patch53 -p0 -b .workspace.vcl100.patch
-%patch54 -p0 -b .workspace.xmergeclean.patch
-%patch55 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
-%patch56 -p0 -b .ooo99427.sd.ensure-icons-state.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.jl115.patch
+%patch29 -p1 -b .workspace.mhu17.patch
+%patch30 -p1 -b .ooo95018.sal.fdwarnings.patch
+%patch31 -p0 -b .workspace.gtkmenuimages.patch
+%patch32 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
+%patch33 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
+%patch34 -p1
+%patch35 -p0 -b .workspace.transogl03redux.patch
+%patch36 -p1 -b .oooXXXXX.extensions.npapi.patch
+%patch37 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
+%patch38 -p1 -b .ooo97488.sw.ww8toc.patch
+%patch39 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
+%patch40 -p1 -b .ooo98137.filter.redeclared-variables.patch
+%patch41 -p1 -b .workspace.cmcfixes54.patch
+%patch42 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch43 -p1 -b .ooo98649.svtools.missingUI.patch
+%patch44 -p1 -b .ooo98885.sw.safeindex.patch
+%patch45 -p1 -b .ooo98909.sfx2.missingplugins.patch
+%patch46 -p1 -R -b .ooo99050.sw.htmlload.patch
+%patch47 -p0 -b .workspace.gfbcrash.patch
+%patch48 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
+%patch49 -p0 -b .ooo99250.sc.autooutline-reflists.patch
+%patch50 -p0 -b .workspace.ooo31gsl2.patch
+%patch51 -p0 -b .workspace.vcl100.patch
+%patch52 -p0 -b .workspace.xmergeclean.patch
+%patch53 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
+%patch54 -p0 -b .ooo99427.sd.ensure-icons-state.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4098,7 +4094,12 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Feb 18 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-1.3
+* Fri Feb 20 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-2.1
+- next milestone
+- drop integrated workspace.mba31issues01.patch
+- drop integrated workspace.fwk102.patch
+
+* Thu Feb 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-1.3
 - rhbz#486062 add workspace.xmergeclean.patch to ensure functionality
 - add Danish thesaurus requires
 - Resolves: rhbz#486062


--- workspace.fwk102.patch DELETED ---


--- workspace.mba31issues01.patch DELETED ---

More information about the scm-commits mailing list