diff --git a/icu.XXXX.buildfix.patch b/icu.7971.buildfix.patch similarity index 54% rename from icu.XXXX.buildfix.patch rename to icu.7971.buildfix.patch index d57b407..280987c 100644 --- a/icu.XXXX.buildfix.patch +++ b/icu.7971.buildfix.patch @@ -1,17 +1,3 @@ ---- icu/source/configure.in 2009-07-01 19:51:26.000000000 +0100 -+++ icu/source/configure.in 2009-11-19 09:12:23.000000000 +0000 -@@ -57,6 +57,11 @@ - - AC_SUBST(cross_compiling) - -+dnl use the pld hack to get ac_fn_cxx_try_link defined globally and not local -+AC_LANG_PUSH([C++]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM()]) -+AC_LANG_POP([C++]) -+ - # make sure install is relative to srcdir - if a script - if test "$srcdir" = "."; then - # If srcdir isn't just ., then (srcdir) is already prepended. --- icu/source/Makefile.in 2010-04-28 17:28:54.000000000 +0200 +++ icu/source/Makefile.in 2010-07-28 22:50:45.056353070 +0200 @@ -18,7 +18,7 @@ diff --git a/icu.7972.buildfix.patch b/icu.7972.buildfix.patch new file mode 100644 index 0000000..f519e60 --- /dev/null +++ b/icu.7972.buildfix.patch @@ -0,0 +1,14 @@ +--- icu/source/configure.in 2009-07-01 19:51:26.000000000 +0100 ++++ icu/source/configure.in 2009-11-19 09:12:23.000000000 +0000 +@@ -57,6 +57,11 @@ + + AC_SUBST(cross_compiling) + ++dnl use the pld hack to get ac_fn_cxx_try_link defined globally and not local ++AC_LANG_PUSH([C++]) ++AC_LINK_IFELSE([AC_LANG_PROGRAM()]) ++AC_LANG_POP([C++]) ++ + # make sure install is relative to srcdir - if a script + if test "$srcdir" = "."; then + # If srcdir isn't just ., then (srcdir) is already prepended. diff --git a/icu.spec b/icu.spec index 582d956..1a0360f 100644 --- a/icu.spec +++ b/icu.spec @@ -1,6 +1,6 @@ Name: icu Version: 4.4.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: International Components for Unicode Group: Development/Tools License: MIT and UCD and Public Domain @@ -13,8 +13,9 @@ Requires: lib%{name} = %{version}-%{release} Patch1: icu-3.4-multiarchdevel.patch Patch2: icu.6995.kannada.patch -Patch3: icu.XXXX.buildfix.patch -Patch4: icu.7932.doublecompare.patch +Patch3: icu.7971.buildfix.patch +Patch4: icu.7972.buildfix.patch +Patch5: icu.7932.doublecompare.patch %description Tools and utilities for developing with icu. @@ -56,8 +57,9 @@ BuildArch: noarch %setup -q -n %{name} %patch1 -p1 -b .multiarchdevel %patch2 -p1 -b .icu6995.kannada.patch -%patch3 -p1 -b .icuXXXX.buildfix.patch -%patch4 -p1 -b .icu7932.doublecompare.patch +%patch3 -p1 -b .icu7971.buildfix.patch +%patch4 -p1 -b .icu7972.buildfix.patch +%patch5 -p1 -b .icu7932.doublecompare.patch %build cd source @@ -139,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %doc source/__docs/%{name}/html/* %changelog +* Wed Sep 22 2010 Caolán McNamara - 4.4.1-5 +- upstream patches + * Thu Sep 09 2010 Caolán McNamara - 4.4.1-4 - Resolves: rhbz#631403 doxygen no longer generates gifs