rpms/openoffice.org/devel openoffice.org-2.0.0.ooo55603.mythes.crash.patch, NONE, 1.1 .cvsignore, 1.82, 1.83 openoffice.org.spec, 1.507, 1.508 sources, 1.120, 1.121

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	.cvsignore openoffice.org.spec sources 
Added Files:
	openoffice.org-2.0.0.ooo55603.mythes.crash.patch 
Log Message:
release candidate 3

openoffice.org-2.0.0.ooo55603.mythes.crash.patch:
 lingucomponent/source/thesaurus/mythes/mythes.cxx |    2 +-
 source/thesaurus/mythes/mythes.cxx                |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.0.ooo55603.mythes.crash.patch ---
Index: source/thesaurus/mythes/mythes.cxx
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/thesaurus/mythes/mythes.cxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 mythes.cxx
--- openoffice.org.orig/lingucomponent/source/thesaurus/mythes/mythes.cxx	9 Mar 2004 12:43:29 -0000	1.3
+++ openoffice.org/lingucomponent/source/thesaurus/mythes/mythes.cxx	7 Oct 2005 09:51:37 -0000
@@ -147,7 +150,7 @@ int MyThes::Lookup(const char * pText, i
     memcpy(wrd,pText,len);
   
     /* find it in the list */
-    int idx = binsearch(wrd,list,nw);
+    int idx = nw > 0 ? binsearch(wrd,list,nw) : -1;
     free(wrd);  
     if (idx < 0) return 0;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- .cvsignore	6 Oct 2005 09:10:58 -0000	1.82
+++ .cvsignore	14 Oct 2005 16:37:06 -0000	1.83
@@ -141,3 +141,4 @@
 SRC680_m130.tar.bz2
 OOO680_m1.tar.bz2
 OOO680_m2.tar.bz2
+OOO680_m3.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -r1.507 -r1.508
--- openoffice.org.spec	7 Oct 2005 08:11:27 -0000	1.507
+++ openoffice.org.spec	14 Oct 2005 16:37:06 -0000	1.508
@@ -1,5 +1,5 @@
-%define ooo2ver 2
-%define ooo_rpm_release 2
+%define ooo2ver 3
+%define ooo_rpm_release 1
 %define ooo_base_name OOO680_m%{ooo2ver}
 %define build_fc5 1
 %define build_fc4 0
@@ -210,6 +210,7 @@
 Patch59: workspace.cmcfixes19.patch
 Patch60: workspace.atkbridge.patch
 Patch61: openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch
+Patch62: openoffice.org-2.0.0.ooo55603.mythes.crash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -886,6 +887,7 @@
 %patch59 -p1 -b .workspace.cmcfixes19.patch
 %patch60 -p1 -b .workspace.atkbridge.patch
 %patch61 -p1 -b .oooXXXXX.sysui.linkforce.patch
+%patch62 -p1 -b .ooo55603.mythes.crash.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -946,7 +948,7 @@
 #make no rpms in sysui for menus
 export RPM=true
 #Set the "This product has been created by..." in Help->About
-export USER="RedHat Inc."
+export USER="Red Hat, Inc"
 unset USERNAME
 #don't duplicate english helpcontent about the place
 unset DEFAULT_TO_ENGLISH_FOR_PACKING
@@ -3233,8 +3235,11 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Fri Oct 07 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-2.2
+* Fri Oct 14 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-3.1
+- release candidate 3
 - alias en_US thesasurus for other en varients
+- can crash on empty thesasurus rh#170091#/ooo#55603#
+- drop thesaruses not in new format
 
 * Thu Oct 06 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-2.1
 - release candidate 2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- sources	7 Oct 2005 08:11:27 -0000	1.120
+++ sources	14 Oct 2005 16:37:07 -0000	1.121
@@ -6,5 +6,5 @@
 66ee360bd11d33b0ba2283922d853706  opens___.ttf
 f2fc336c9bd7672a13e58d39bbb4553f  GSI_ga.sdf
 49c02048e40f0b51a97abdb94d97dc1f  javavendors.xml
-51a7e3200b922309d499373a7a19fa9e  OOO680_m2.tar.bz2
 d1fdb808b35be046bf86a7e3f2fc6f2a  openoffice.org-myspell-contrib.tar.gz
+ec9ad740640323d4d5b80abe40ab1303  OOO680_m3.tar.bz2