rpms/openoffice.org/F-9 openoffice.org.spec, 1.1509, 1.1510 openoffice.org-2.4.0.ooo93119.shell.echos.patch, 1.1, NONE openoffice.org-3.0.0.ooo90071.chart2.negativecount.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21881

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.4.0.ooo93119.shell.echos.patch 
	openoffice.org-3.0.0.ooo90071.chart2.negativecount.patch 
Log Message:
2.4.2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1509
retrieving revision 1.1510
diff -u -r1.1509 -r1.1510
--- openoffice.org.spec	28 Oct 2008 10:02:01 -0000	1.1509
+++ openoffice.org.spec	29 Oct 2008 09:38:17 -0000	1.1510
@@ -1,6 +1,6 @@
 %define oootag OOH680
-%define ooomilestone 17
-%define rh_rpm_release 7
+%define ooomilestone 18
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -42,7 +42,7 @@
 
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
-Version:        2.4.1
+Version:        2.4.2
 Release: 	%{ooomilestone}.%{rh_rpm_release}%{?dist}
 Epoch:		1
 License:	LGPLv2 and LGPLv2+ and MPLv1.1 and BSD
@@ -153,25 +153,23 @@
 Patch78: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
 Patch79: openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
 Patch80: openoffice.org-2.4.0.ooo87071.sd.backgroundfix.patch
-Patch81: openoffice.org-3.0.0.ooo90071.chart2.negativecount.patch
-Patch82: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
-Patch83: workspace.impress138.patch
-Patch84: openoffice.org-2.4.0.gcc36187.noaliasingbusted.patch
-Patch85: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch86: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
-Patch87: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
-Patch88: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
-Patch89: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
-Patch90: openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
-Patch91: workspace.locdat30.patch
-Patch92: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
-Patch93: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
-Patch94: openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash
-Patch95: openoffice.org-3.0.0.ooo92343.svtools.strangethrow.patch
-Patch96: openoffice.org-2.4.0.ooo93119.shell.echos.patch
-Patch97: openoffice.org-2.4.1.ooo92217.sal.alloc.patch
-Patch98: openoffice.org-2.4.1.ooo81576.vcl.fixscale.patch
-Patch99: openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch
+Patch81: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
+Patch82: workspace.impress138.patch
+Patch83: openoffice.org-2.4.0.gcc36187.noaliasingbusted.patch
+Patch84: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch85: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
+Patch86: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
+Patch87: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
+Patch88: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
+Patch89: openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
+Patch90: workspace.locdat30.patch
+Patch91: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
+Patch92: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
+Patch93: openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash
+Patch94: openoffice.org-3.0.0.ooo92343.svtools.strangethrow.patch
+Patch95: openoffice.org-2.4.1.ooo92217.sal.alloc.patch
+Patch96: openoffice.org-2.4.1.ooo81576.vcl.fixscale.patch
+Patch97: openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1139,25 +1137,23 @@
 %patch78 -p1 -b .ooo87991.fpickersafe.patch
 %patch79 -p1 -b .ooo88033.svx.a11ycrash.patch
 %patch80 -p1 -b .ooo87071.sd.backgroundfix.patch
-%patch81 -p1 -b .ooo90071.chart2.negativecount.patch
-%patch82 -p1 -b .ooo89002.vcl.symbolfonts.patch
-%patch83 -p1 -b .workspace.impress138.patch
-%patch84 -p1 -b .gcc36187.noaliasingbusted.patch
-%patch85 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch86 -p1 -b .ooo90037.vcl.cairotransforms.patch
-%patch87 -p1 -b .ooo82545.np_sdk.x86_64.patch
-%patch88 -p1 -b .ooo90306.sw.wrongprotection.patch
-%patch89 -p1 -b .ooo48400.svx.fixspelling.patch
-%patch90 -p1 -b .ooo90697.sd.a11ycrash.patch
-%patch91 -p1 -b .workspace.locdat30.patch
-%patch92 -p1 -b .ooo86142.serbiannumbering.patch
-%patch93 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
-%patch94 -p1 -b .ooo92253.dbaccess.a11y.crash
-%patch95 -p1 -b .ooo92343.svtools.strangethrow.patch
-%patch96 -p1 -b .ooo93119.shell.echos.patch
-%patch97 -p1 -b .ooo92217.sal.alloc.patch
-%patch98 -p1 -b .ooo81576.vcl.fixscale.patch
-%patch99 -p1 -b .ooo95533.sw.safertableexport.patch
+%patch81 -p1 -b .ooo89002.vcl.symbolfonts.patch
+%patch82 -p1 -b .workspace.impress138.patch
+%patch83 -p1 -b .gcc36187.noaliasingbusted.patch
+%patch84 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch85 -p1 -b .ooo90037.vcl.cairotransforms.patch
+%patch86 -p1 -b .ooo82545.np_sdk.x86_64.patch
+%patch87 -p1 -b .ooo90306.sw.wrongprotection.patch
+%patch88 -p1 -b .ooo48400.svx.fixspelling.patch
+%patch89 -p1 -b .ooo90697.sd.a11ycrash.patch
+%patch90 -p1 -b .workspace.locdat30.patch
+%patch91 -p1 -b .ooo86142.serbiannumbering.patch
+%patch92 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
+%patch93 -p1 -b .ooo92253.dbaccess.a11y.crash
+%patch94 -p1 -b .ooo92343.svtools.strangethrow.patch
+%patch95 -p1 -b .ooo92217.sal.alloc.patch
+%patch96 -p1 -b .ooo81576.vcl.fixscale.patch
+%patch97 -p1 -b .ooo95533.sw.safertableexport.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2953,10 +2949,12 @@
 
 
 %changelog
-* Tue Oct 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.7
+* Wed Oct 29 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.2-18.1
 - Resolves: ooo#94495 Toggle weblayout/normal layout and notes
 - Resolves: rhbz#465792 openoffice.org-2.4.1.ooo81576.vcl.fixscale.patch
 - Resolves: rhbz#468336 openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch
+- CVE-2008-2237: Manipulated WMF files
+- CVE-2008-2238: Manipulated EMF files
 
 * Tue Aug 26 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.6
 - Resolves: CVE-2008-3282 numeric truncation error in OOo memory allocator


--- openoffice.org-2.4.0.ooo93119.shell.echos.patch DELETED ---


--- openoffice.org-3.0.0.ooo90071.chart2.negativecount.patch DELETED ---