diff --git a/icu-testtwodigityear.patch b/icu-testtwodigityear.patch deleted file mode 100644 index 6d22097..0000000 --- a/icu-testtwodigityear.patch +++ /dev/null @@ -1,13 +0,0 @@ -In the year 2034 ... -http://sourceforge.net/p/icu/mailman/message/32443311/ ---- icu.orig/source/test/intltest/dtfmttst.cpp 2013-10-04 22:48:00.000000000 +0200 -+++ icu/source/test/intltest/dtfmttst.cpp 2014-06-13 19:34:40.611299572 +0200 -@@ -1129,7 +1129,7 @@ - return; - } - parse2DigitYear(fmt, "5/6/17", date(117, UCAL_JUNE, 5)); -- parse2DigitYear(fmt, "4/6/34", date(34, UCAL_JUNE, 4)); -+ parse2DigitYear(fmt, "4/6/34", date(134, UCAL_JUNE, 4)); - } - - // ------------------------------------- diff --git a/icu.spec b/icu.spec index d2bee6d..08f6f22 100644 --- a/icu.spec +++ b/icu.spec @@ -1,11 +1,11 @@ Name: icu -Version: 53.1 +Version: 54.1 Release: 1%{?dist} Summary: International Components for Unicode Group: Development/Tools License: MIT and UCD and Public Domain URL: http://www.icu-project.org/ -Source0: http://download.icu-project.org/files/icu4c/53.1/icu4c-53_1-src.tgz +Source0: http://download.icu-project.org/files/icu4c/54.1/icu4c-54_1-src.tgz Source1: icu-config.sh BuildRequires: doxygen, autoconf, python Requires: lib%{name}%{?_isa} = %{version}-%{release} @@ -15,7 +15,6 @@ Patch2: icu.8800.freeserif.crash.patch Patch3: icu.7601.Indic-ccmp.patch Patch4: gennorm2-man.patch Patch5: icuinfo-man.patch -Patch6: icu-testtwodigityear.patch %description Tools and utilities for developing with icu. @@ -63,7 +62,6 @@ BuildArch: noarch %patch3 -p1 -b .icu7601.Indic-ccmp.patch %patch4 -p1 -b .gennorm2-man.patch %patch5 -p1 -b .icuinfo-man.patch -%patch6 -p1 -b .icu-testtwodigityear.patch %build cd source @@ -172,6 +170,9 @@ make %{?_smp_mflags} -C source check %doc source/__docs/%{name}/html/* %changelog +* Mon Jan 26 2015 Eike Rathke - 54.1-1 +- Resolves: rhbz#1185433 upgrade to upstream ICU 54.1 + * Tue Aug 26 2014 Eike Rathke - 53.1-1 - Resolves: rhbz#1130771 upgrade to upstream ICU 53.1 diff --git a/sources b/sources index 655962e..815ce27 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b73baa6fbdfef197608d1f69300919b9 icu4c-53_1-src.tgz +e844caed8f2ca24c088505b0d6271bc0 icu4c-54_1-src.tgz d0cd9a661a7afb5f9a82bbc6a7897930 icu-config.sh