rpms/openoffice.org/FC-5 openoffice.org.spec, 1.668, 1.669 sources, 1.166, 1.167

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4706

Modified Files:
	openoffice.org.spec sources 
Log Message:
port to FC-5


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.668
retrieving revision 1.669
diff -u -r1.668 -r1.669
--- openoffice.org.spec	9 Jun 2006 11:16:02 -0000	1.668
+++ openoffice.org.spec	26 Jun 2006 15:37:02 -0000	1.669
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 13
+%define rh_rpm_release 14
 
 %define build_fc5 1
 
@@ -96,7 +96,6 @@
 Source12:	ooo64726.sdf
 Source13:	AutoSaveRecovery.xcu
 Source14:	AutoSaveCommon.xcu
-Source15:	DisableJavaApplets.xcu
 BuildRequires:	tcsh, perl, sed, zip, bzip2, unzip, tar, findutils, prelink
 BuildRequires:	autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
 BuildRequires:	gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils, perl-Archive-Zip
@@ -173,7 +172,10 @@
 Patch44: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
 Patch45: openoffice.org-2.0.3.ooo65721.crash.vcl.patch
 Patch46: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
-Patch47: openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch
+Patch47: openoffice.org-2.0.3.ooo65519.printing.samba.patch
+Patch48: openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch
+Patch49: disable-java-applets.diff
+Patch50: sax+source+expatwrap+xml2utf.cxx.diff
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -829,7 +831,11 @@
 %patch44 -p1 -b .oooXXXXX.atkbroken.vcl.patch
 %patch45 -p1 -b .ooo65721.crash.vcl.patch
 %patch46 -p1 -b .ooo66067.embeddedobj.crash.patch
-%patch47 -p1 -b .oooXXXXX.safety.sfx2.patch
+%patch47 -p1 -b .ooo65519.printing.samba.patch
+%patch48 -p1 -b .oooXXXXX.safety.sfx2.patch
+%patch49 -p1 -b .disable-java-applets.diff
+%patch50 -p1 -b .sax+source+expatwrap+xml2utf.cxx.diff
+
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -994,7 +1000,6 @@
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE4}
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE13}
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE14}
-$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE15}
 
 # rh#163147# convert non AMT to AMT fonts
 sed -i -e "s/Thorndale/Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu
@@ -3276,9 +3281,14 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Jun 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.14
+- CVE-2006-2198 macro security
+- CVE-2006-2199 java applets
+- CVE-2006-3117 corrupt file format
+- rh#195637# add openoffice.org-2.0.3.ooo65519.printing.samba.patch
+
 * Thu Jun 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.13
 - rh#193918# add openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
-- sfx2 safety patch
 
 * Tue May 23 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.12
 - ooo#65721# sneaky bug in a11y


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/sources,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- sources	26 Jun 2006 10:31:24 -0000	1.166
+++ sources	26 Jun 2006 15:37:02 -0000	1.167
@@ -12,5 +12,4 @@
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
 5a7c718e63d09f42fd40017b28dffd10  AutoSaveCommon.xcu
 d57f21d70ba34ddb20f40a4d08427722  AutoSaveRecovery.xcu
-baaf6187c060cc0525acbe4c07748025  DisableJavaApplets.xcu
 cc92c22601beae1800342255d1a18ff1  openoffice.org-myspell-contrib.tar.gz