diff --git a/icu.icu5498.openoffice.org.patch b/icu.icu5498.openoffice.org.patch deleted file mode 100644 index 18b9793..0000000 --- a/icu.icu5498.openoffice.org.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ru icu.orig/source/common/unicode/rbbi.h icu/source/common/unicode/rbbi.h ---- icu.orig/source/common/unicode/rbbi.h 2007-11-13 11:45:19.000000000 +0000 -+++ icu/source/common/unicode/rbbi.h 2007-11-13 11:46:05.000000000 +0000 -@@ -611,12 +611,14 @@ - virtual int32_t getBreakType() const; - #endif - -+public: - /** - * Set the type of the break iterator. - * @internal - */ - virtual void setBreakType(int32_t type); - -+protected: - /** - * Common initialization function, used by constructors and bufferClone. - * (Also used by DictionaryBasedBreakIterator::createBufferClone().) diff --git a/icu.spec b/icu.spec index 1045104..1805805 100644 --- a/icu.spec +++ b/icu.spec @@ -1,6 +1,6 @@ Name: icu Version: 4.0 -Release: 0.1.d02%{?dist} +Release: 0.2.d02%{?dist} Summary: International Components for Unicode Group: Development/Tools License: MIT @@ -18,9 +18,8 @@ Patch6: icu.icu5557.safety.patch Patch7: icu.icu5506.multiplevowels.patch Patch8: icu.icuXXXX.malayalam.bysyllable.patch Patch9: icu.icu6008.arm.padding.patch -Patch10: icu.icu5498.openoffice.org.patch -Patch11: icu.icu6213.worstcase.patch -Patch12: icu.icu6284.strictalias.patch +Patch10: icu.icu6213.worstcase.patch +Patch11: icu.icu6284.strictalias.patch %description Tools and utilities for developing with icu. @@ -67,9 +66,8 @@ Group: Documentation %patch7 -p1 -b .icu5506.multiplevowels.patch %patch8 -p1 -b .icuXXXX.malayalam.bysyllable.patch %patch9 -p1 -b .icu6008.arm.padding.patch -%patch10 -p1 -b .icu5498.openoffice.org.patch -%patch11 -p1 -b .icu6213.worstcase.patch -%patch12 -p1 -b .icu6284.strictalias.patch +%patch10 -p1 -b .icu6213.worstcase.patch +%patch11 -p1 -b .icu6284.strictalias.patch %build cd source @@ -142,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT %doc source/__docs/%{name}/html/* %changelog +* Wed Jun 04 2008 Caolan McNamara - 4.0-0.2.d02 +- drop icu.icu5498.openoffice.org.patch + * Sun May 31 2008 Caolan McNamara - 4.0-0.1.d02 - 4.0 release candidate - drop integrated icu.regexp.patch