rpms/icu/devel icu.icu6439.bare.elif.patch, NONE, 1.1 icu.spec, 1.85, 1.86

Caolan McNamara caolanm at fedoraproject.org
Tue Feb 3 16:33:24 UTC 2009


Author: caolanm

Update of /cvs/pkgs/rpms/icu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv871

Modified Files:
	icu.spec 
Added Files:
	icu.icu6439.bare.elif.patch 
Log Message:
fix bare elif for gcc-4.4

icu.icu6439.bare.elif.patch:

--- NEW FILE icu.icu6439.bare.elif.patch ---
--- 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)


Index: icu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu/devel/icu.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- icu.spec	16 Jan 2009 10:57:59 -0000	1.85
+++ icu.spec	3 Feb 2009 16:32:54 -0000	1.86
@@ -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 @@
 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 @@
 %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 @@
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Tue Feb 03 2009 Caolan McNamara <caolanm at redhat.com> - 4.0.1-2
+- fix bare elif for gcc-4.4
+
 * Fri Jan 16 2009 Caolan McNamara <caolanm at redhat.com> - 4.0.1-1
 - 4.0.1 release
 




More information about the fedora-extras-commits mailing list