diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-11-25 19:11:32 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-11-25 19:11:32 +0100 |
| commit | c311e9efcba3e87e90ad43790c52746a4c009f96 (patch) | |
| tree | 9315fe41127163b9243371d5a1cd0b933f9875ff | |
| parent | e65bdf87039ac0b7ccfbd1706e02681c3ab1e5bf (diff) | |
icu-last: add patch from fedora rawhide, fix FTBFS
| -rw-r--r-- | icu-last.spec | 3 | ||||
| -rw-r--r-- | icu-testtwodigityear.patch | 13 |
2 files changed, 16 insertions, 0 deletions
diff --git a/icu-last.spec b/icu-last.spec index 27f8f40..f82a768 100644 --- a/icu-last.spec +++ b/icu-last.spec @@ -38,6 +38,8 @@ Patch6: icuinfo-man.patch Patch7: icu.10143.memory.leak.crash.patch Patch8: icu.10318.CVE-2013-2924_changeset_34076.patch Patch9: icu.rhbz1074549.CVE-2013-5907.patch +# Patch6 from fedora rawhide spec +Patch10: icu-testtwodigityear.patch %description Tools and utilities for developing with icu. @@ -100,6 +102,7 @@ Provides: lib%{srcname}-doc = %{version}-%{release} %patch7 -p1 -b .icu10143.memory.leak.crash.patch %patch8 -p1 -b .icu10318.CVE-2013-2924_changeset_34076.patch %patch9 -p1 -b .icurhbz1074549.CVE-2013-5907.patch +%patch10 -p1 -b .icu-testtwodigityear.patch %build cd source diff --git a/icu-testtwodigityear.patch b/icu-testtwodigityear.patch new file mode 100644 index 0000000..6d22097 --- /dev/null +++ b/icu-testtwodigityear.patch @@ -0,0 +1,13 @@ +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)); + } + + // ------------------------------------- |