From 43a0c23a8900b55fce1df9e2aae75e9f1c207009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 12 Apr 2011 12:51:19 +0100 Subject: [PATCH] drop integrated libreoffice-fdo31271.icu.patch --- libreoffice-fdo31271.icu.patch | 13 ------------- libreoffice.spec | 10 ++++------ 2 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 libreoffice-fdo31271.icu.patch diff --git a/libreoffice-fdo31271.icu.patch b/libreoffice-fdo31271.icu.patch deleted file mode 100644 index ce00228..0000000 --- a/libreoffice-fdo31271.icu.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/libreoffice.spec b/libreoffice.spec index 8cad278..5eadc61 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -80,9 +80,7 @@ Patch6: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch Patch7: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch Patch8: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch Patch9: libreoffice-installfix.patch -Patch10: libreoffice-fdo31271.icu.patch -Patch11: 0001-add-flat-xml-types-to-.desktop-files-etc.patch -Patch12: 0001-helgrind-Related-rhbz-655686-get-order-of-shutdown-c.patch +Patch10: 0001-helgrind-Related-rhbz-655686-get-order-of-shutdown-c.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -695,9 +693,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch7 -p1 -b .ooo108637.sfx2.uisavedir.patch %patch8 -p0 -b .ooo113273.desktop.resolvelinks.patch %patch9 -p1 -b .libreoffice-installfix.patch -%patch10 -p1 -b .fdo31271.icu.patch -%patch11 -p1 -b .add-flat-xml-types-to-.desktop-files-etc.patch -%patch12 -p1 -b .rhbz655686-get-order-of-shutdown-c.patch +%patch10 -p1 -b .rhbz655686-get-order-of-shutdown-c.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -2072,6 +2068,8 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : - drop integrated rhbz680766.fix-mdds-crash.patch - drop integrated 0001-Resolves-rhbz-684580-X-and-strike-through-escapes-ra.patch - drop integrated 0001-set-mime-types-on-flat-xml-filters.patch +- drop integrated 0001-add-flat-xml-types-to-.desktop-files-etc.patch +- drop integrated libreoffice-fdo31271.icu.patch * Tue Apr 05 2011 Caolán McNamara 3.3.2.2-6 - Resolves: rhbz#655686 get order of shutdown correct