rpms/openoffice.org/devel openoffice.org-2.3.0.ooo81314.i18npool.crash.patch, NONE, 1.1 openoffice.org-simple-crash_report.sh, 1.6, 1.7 openoffice.org.spec, 1.1365, 1.1366

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7024

Modified Files:
	openoffice.org-simple-crash_report.sh openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo81314.i18npool.crash.patch 
Log Message:
Resolves: rhbz#427071 openoffice.org-2.3.0.ooo81314.i18npool.crash.patch

openoffice.org-2.3.0.ooo81314.i18npool.crash.patch:

--- NEW FILE openoffice.org-2.3.0.ooo81314.i18npool.crash.patch ---
Index: source/localedata/localedata.cxx
===================================================================
RCS file: /cvs/l10n/i18npool/source/localedata/localedata.cxx,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- openoffice.org.orig/i18npool/source/localedata/localedata.cxx	15 Oct 2007 12:54:36 -0000	1.52
+++ openoffice.org/i18npool/source/localedata/localedata.cxx	23 Oct 2007 09:09:12 -0000	1.53
@@ -1161,8 +1161,10 @@
         Locale aFbLocale = MsLangId::getFallbackLocale( aLocale);
         if (aFbLocale == aLocale)
             bFallback = false;  // may be a "language-only-locale" like Interlingua (ia)
-        else if (aFbLocale.Country.getLength())
-            aFallback = aFbLocale.Language + under + aFbLocale.Country;
+        else if (aFbLocale.Country.getLength()) {
+            OUStringBuffer aBuf(5);
+            aFallback = aBuf.append(aFbLocale.Language).append( under).append(aFbLocale.Country).makeStringAndClear();
+        }
         else
             aFallback = aFbLocale.Language;
     }


Index: openoffice.org-simple-crash_report.sh
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-simple-crash_report.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openoffice.org-simple-crash_report.sh	3 Dec 2007 14:15:47 -0000	1.6
+++ openoffice.org-simple-crash_report.sh	2 Jan 2008 11:01:08 -0000	1.7
@@ -15,7 +15,10 @@
 echo "(VII)  accessibility is:" `gconftool-2 -g "/desktop/gnome/interface/accessibility"` >> $filename
 if [ -e /etc/fedora-release ]; then
 echo "(VIII) fedora release is:" `cat /etc/fedora-release` >> $filename
+elif [ -e /etc/redhat-release ]; then
+echo "(VIII) redhat release is:" `cat /etc/redhat-release` >> $filename
 fi
+echo "(VIV)  LANG is: $LANG" >> $filename
 echo "...start free space details ..." >> $filename
 df -k /home /tmp >> $filename
 echo "...end free space details ..." >> $filename


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1365
retrieving revision 1.1366
diff -u -r1.1365 -r1.1366
--- openoffice.org.spec	20 Dec 2007 10:53:23 -0000	1.1365
+++ openoffice.org.spec	2 Jan 2008 11:01:08 -0000	1.1366
@@ -1,6 +1,6 @@
 %define oootag OOG680
 %define ooomilestone 9
-%define rh_rpm_release 10
+%define rh_rpm_release 11
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -165,6 +165,7 @@
 Patch80: workspace.locales24.patch
 Patch81: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
 Patch82: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
+Patch83: openoffice.org-2.3.0.ooo81314.i18npool.crash.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1128,6 +1129,7 @@
 %patch80 -p1 -b .workspace.locales24.patch
 %patch81 -p1 -b .ooo84621.sw.insertexcel.patch
 %patch82 -p1 -b .ooo84770.svx.eventsmismatch.patch
+%patch83 -p1 -b .ooo81314.i18npool.crash.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2853,6 +2855,9 @@
 
 
 %changelog
+* Wed Jan 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.11
+- Resolves: rhbz#427071 openoffice.org-2.3.0.ooo81314.i18npool.crash.patch
+
 * Thu Dec 20 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.10
 - Resolves: rhbz#425701 add workspace.locales24.patch
 - Resolves: rhbz#423371 openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch