From 59881b453993ccbcdc5cb2ce978dd041a75af5ad Mon Sep 17 00:00:00 2001 From: Caolan McNamara Date: Tue, 3 Feb 2009 16:32:54 +0000 Subject: [PATCH] fix bare elif for gcc-4.4 --- icu.icu6439.bare.elif.patch | 11 +++++++++++ icu.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 icu.icu6439.bare.elif.patch diff --git a/icu.icu6439.bare.elif.patch b/icu.icu6439.bare.elif.patch new file mode 100644 index 0000000..55bc823 --- /dev/null +++ b/icu.icu6439.bare.elif.patch @@ -0,0 +1,11 @@ +--- icu.orig/source/layoutex/ParagraphLayout.cpp 2009-02-03 16:29:07.000000000 +0000 ++++ icu/source/layoutex/ParagraphLayout.cpp 2009-02-03 16:29:19.000000000 +0000 +@@ -868,7 +868,7 @@ + + return nullLanguageCode; + } +-#elif ++#else + + // TODO - dummy implementation for right now... + le_int32 ParagraphLayout::getLanguageCode(const Locale *locale) diff --git a/icu.spec b/icu.spec index 093c2b9..bf573e0 100644 --- a/icu.spec +++ b/icu.spec @@ -1,6 +1,6 @@ Name: icu Version: 4.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: International Components for Unicode Group: Development/Tools License: MIT @@ -15,6 +15,7 @@ Patch2: icu.icuXXXX.virama.prevnext.patch Patch3: icu.icu6008.arm.padding.patch Patch4: icu.icu6213.worstcase.patch Patch5: icu.icu6284.strictalias.patch +Patch6: icu.icu6439.bare.elif.patch %description Tools and utilities for developing with icu. @@ -58,6 +59,7 @@ Group: Documentation %patch3 -p1 -b .icu6008.arm.padding.patch %patch4 -p1 -b .icu6213.worstcase.patch %patch5 -p1 -b .icu6284.strictalias.patch +%patch6 -p1 -b .icu6439.bare.elif.patch %build cd source @@ -134,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT %doc source/__docs/%{name}/html/* %changelog +* Tue Feb 03 2009 Caolan McNamara - 4.0.1-2 +- fix bare elif for gcc-4.4 + * Fri Jan 16 2009 Caolan McNamara - 4.0.1-1 - 4.0.1 release