diff --git a/.gitignore b/.gitignore index d5b802d..28c6fa8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/icu-51-layout-fix-10107.tgz -SOURCES/icu4c-50_1_2-src.tgz +SOURCES/icu4c-50_2-src.tgz diff --git a/.icu.metadata b/.icu.metadata index acb4f6d..5551471 100644 --- a/.icu.metadata +++ b/.icu.metadata @@ -1,2 +1,2 @@ ce66d8b9e2add1db796a05ed8229ec188f74c473 SOURCES/icu-51-layout-fix-10107.tgz -ee121e3ba2c3599b36b3d3b4abf68f28e23c9b4a SOURCES/icu4c-50_1_2-src.tgz +9f2672a66f2ed9259620e3d0f5667e400c2e532b SOURCES/icu4c-50_2-src.tgz diff --git a/SOURCES/do-not-fail-intltest-because-of-changed-data.patch b/SOURCES/do-not-fail-intltest-because-of-changed-data.patch deleted file mode 100644 index 1bd70f0..0000000 --- a/SOURCES/do-not-fail-intltest-because-of-changed-data.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- icu/source/test/intltest/intltest.cpp 2013-01-11 01:22:00.000000000 +0100 -+++ icu/source/test/intltest/intltest.cpp 2018-06-15 09:17:32.714205868 +0200 -@@ -1425,7 +1425,11 @@ - if(ctest_xml_fini()) - return 1; - -- return major.getErrors(); -+ if(!warnOnMissingData) { -+ return major.getErrors(); -+ } else { -+ return 0; -+ } - } - - const char* IntlTest::loadTestData(UErrorCode& err){ diff --git a/SOURCES/icu-testtwodigityear.patch b/SOURCES/icu-testtwodigityear.patch deleted file mode 100644 index 6d22097..0000000 --- a/SOURCES/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/SPECS/icu.spec b/SPECS/icu.spec index 4874261..19e5f01 100644 --- a/SPECS/icu.spec +++ b/SPECS/icu.spec @@ -1,11 +1,11 @@ Name: icu -Version: 50.1.2 -Release: 17%{?dist} +Version: 50.2 +Release: 3%{?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/50.1.2/icu4c-50_1_2-src.tgz +Source0: https://github.com/unicode-org/icu/releases/download/release-50-2/icu4c-50_2-src.tgz # According to ICU the layout "patch" should be applied to all versions earlier than 51.2 # See also http://site.icu-project.org/download/51#TOC-Known-Issues Source1: http://download.icu-project.org/files/icu4c/51.1/icu-51-layout-fix-10107.tgz @@ -26,8 +26,6 @@ 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 -Patch10: icu-testtwodigityear.patch -Patch11: do-not-fail-intltest-because-of-changed-data.patch %description Tools and utilities for developing with icu. @@ -80,8 +78,6 @@ BuildArch: noarch %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 -%patch11 -p1 -b .do-not-fail-intltest-because-of-changed-data.patch # http://userguide.icu-project.org/datetime/timezone#TOC-Updating-the-Time-Zone-Data # says: @@ -96,6 +92,8 @@ cp %{SOURCE11} source/data/misc/ cp %{SOURCE12} source/data/misc/ cp %{SOURCE13} source/data/misc/ +chmod 644 source/i18n/unicode/selfmt.h + %build cd source autoconf @@ -216,6 +214,19 @@ make %{?_smp_mflags} -C source check CINTLTST_OPTS=-w INTLTEST_OPTS=-w %doc source/__docs/%{name}/html/* %changelog +* Fri May 17 2019 Mike FABIAN - 50.2-3 +- Bump release number +- Related: rhbz#1677092 + +* Fri May 17 2019 Mike FABIAN - 50.2-2 +- Fix rpmdiff failure: File /usr/src/debug/icu/source/i18n/unicode/selfmt.h + relaxed permissions from 0644 to 0755 on all architectures +- Related: rhbz#1677092 + +* Tue May 07 2019 Mike FABIAN - 50.2-1 +- Update to 50.2 maintenance release including support for new Japanese era Reiwa (令和). +- Resolves: rhbz#1677092 + * Thu Jun 07 2018 Mike FABIAN - 50.1.2-17 - Resolves: rhbz#1169339 Update timezone data to tz 2018e