[openoffice.org/f14/master] Resolves: rhbz#671540 fix lonely )
Caolan McNamara
caolanm at fedoraproject.org
Mon Jan 24 21:12:11 UTC 2011
commit 62fddc70d83f85740029fbdb026d7143b4fafb60
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 21:12:03 2011 +0000
Resolves: rhbz#671540 fix lonely )
libreoffice-fdo31271.icu.patch | 13 +++++++++++++
openoffice.org.spec | 7 ++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/libreoffice-fdo31271.icu.patch b/libreoffice-fdo31271.icu.patch
new file mode 100644
index 0000000..ce00228
--- /dev/null
+++ b/libreoffice-fdo31271.icu.patch
@@ -0,0 +1,13 @@
+diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt
+index cbabee6..bc27bb8 100644
+--- a/i18npool/source/breakiterator/data/line.txt
++++ b/i18npool/source/breakiterator/data/line.txt
+@@ -61,7 +61,7 @@ $BB = [:LineBreak = Break_Before:];
+ $BK = [:LineBreak = Mandatory_Break:];
+ $B2 = [:LineBreak = Break_Both:];
+ $CB = [:LineBreak = Contingent_Break:];
+-$CL = [:LineBreak = Close_Punctuation:] ;
++$CL = [[:LineBreak = Close_Punctuation:] [:LineBreak = Close_Parenthesis:]];
+ $CM = [:LineBreak = Combining_Mark:];
+ $CR = [:LineBreak = Carriage_Return:];
+ $EX = [:LineBreak = Exclamation:];
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 2c8902d..04b223b 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
%define oootag OOO330
%define ooomilestone 20
-%define rh_rpm_release 1
+%define rh_rpm_release 2
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
@@ -156,6 +156,7 @@ Patch72: 0001-Resolves-rhbz-660342-Undo-Redo-crash-with-postits.patch
Patch73: 0001-Resolves-rhbz-666088-clean-up-search-cache-singleton.patch
Patch74: 0001-rhbz-659394-avoid-mangling-internal-state-in-case-of.patch
Patch75: openoffice.org-3.3.0.rh668349.backportstatusicon.patch
+Patch76: libreoffice-fdo31271.icu.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -1728,6 +1729,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
%patch73 -p1 -b .rhbz-666088-clean-up-search-cache-singleton.patch
%patch74 -p1 -b .rhbz-659394-avoid-mangling-internal-state-in-case-of.patch
%patch75 -p0 -b .rh668349.backportstatusicon.patch
+%patch76 -p0 -b .libreoffice-fdo31271.icu.patch
touch scripting/source/pyprov/delzip
touch scripting/util/provider/beanshell/delzip
touch scripting/util/provider/javascript/delzip
@@ -3923,6 +3925,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
%endif
%changelog
+* Mon Jan 24 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.2
+- Resolves: rhbz#671540 fix lonely )
+
* Wed Jan 19 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.1
- Resolves: rhbz#668349 Backport replace libegg with gtkStatusicon
- latest milestone
More information about the scm-commits
mailing list