rpms/openoffice.org/devel openoffice.org.spec, 1.1845, 1.1846 openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch, 1.1, NONE workspace.gfbcrash.patch, 1.1, NONE workspace.ooo31gsl2.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-serv27887

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch 
	workspace.gfbcrash.patch workspace.ooo31gsl2.patch 
Log Message:
next version


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1845
retrieving revision 1.1846
diff -u -r1.1845 -r1.1846
--- openoffice.org.spec	3 Mar 2009 22:44:48 -0000	1.1845
+++ openoffice.org.spec	4 Mar 2009 23:42:17 -0000	1.1846
@@ -1,6 +1,6 @@
 %define oootag OOO310
-%define ooomilestone 3
-%define rh_rpm_release 4
+%define ooomilestone 4
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -123,20 +123,17 @@
 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: workspace.gfbcrash.patch
-Patch46: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
-Patch47: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
-Patch48: workspace.ooo31gsl2.patch
-Patch49: workspace.vcl100.patch
-Patch50: workspace.xmergeclean.patch
-Patch51: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
-Patch52: openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch
-Patch53: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
-Patch54: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
-Patch55: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
-Patch56: openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch
-Patch57: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch58: workspace.localization35.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: openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.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: workspace.localization35.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1596,20 +1593,17 @@
 %patch42 -p1 -b .workspace.fwk103.patch
 %patch43 -p1 -b .ooo98885.sw.safeindex.patch
 %patch44 -p1 -R -b .ooo99050.sw.htmlload.patch
-%patch45 -p0 -b .workspace.gfbcrash.patch
-%patch46 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
-%patch47 -p0 -b .ooo99250.sc.autooutline-reflists.patch
-%patch48 -p0 -b .workspace.ooo31gsl2.patch
-%patch49 -p0 -b .workspace.vcl100.patch
-%patch50 -p0 -b .workspace.xmergeclean.patch
-%patch51 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
-%patch52 -p0 -b .ooo99427.sd.ensure-icons-state.patch
-%patch53 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch
-%patch54 -p0 -b .ooo99529.sw.notrailingnewline.patch
-%patch55 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
-%patch56 -p0 -b .ooo98465.sw.fix-doctables.patch
-%patch57 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch58 -p0 -b .workspace.localization35.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 .ooo99427.sd.ensure-icons-state.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 -p0 -b .workspace.localization35.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4109,6 +4103,11 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Mar 05 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-4.1
+- drop integrated workspace.gfbcrash.patch
+- drop integrated workspace.ooo31gsl2.patch
+- drop integrated openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch
+
 * Tue Mar 03 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-3.4
 - Resolves: rhbz#488228 Assamese Translations
 - Resolves: rhbz#488234 Tamil Translations


--- openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch DELETED ---


--- workspace.gfbcrash.patch DELETED ---


--- workspace.ooo31gsl2.patch DELETED ---