diff --git a/armv7hl-disable-tests.patch b/armv7hl-disable-tests.patch index fb69ed4..2d869b1 100644 --- a/armv7hl-disable-tests.patch +++ b/armv7hl-disable-tests.patch @@ -1,7 +1,7 @@ -diff -ur orig.icu/source/test/cintltst/cnmdptst.c icu/source/test/cintltst/cnmdptst.c ---- orig.icu/source/test/cintltst/cnmdptst.c 2015-10-08 05:51:46.000000000 +0200 -+++ icu/source/test/cintltst/cnmdptst.c 2015-10-27 19:40:27.537963317 +0100 -@@ -185,6 +185,12 @@ +diff -ru orig.icu/source/test/cintltst/cnmdptst.c icu/source/test/cintltst/cnmdptst.c +--- orig.icu/source/test/cintltst/cnmdptst.c 2016-03-23 21:48:18.000000000 +0100 ++++ icu/source/test/cintltst/cnmdptst.c 2016-04-15 18:34:06.148251985 +0200 +@@ -186,6 +186,12 @@ /* Test exponential pattern*/ static void TestExponential(void) { @@ -14,9 +14,9 @@ diff -ur orig.icu/source/test/cintltst/cnmdptst.c icu/source/test/cintltst/cnmdp int32_t pat_length, val_length, lval_length; int32_t ival, ilval, p, v, lneed; UNumberFormat *fmt; -diff -ur orig.icu/source/test/intltest/dcfmtest.cpp icu/source/test/intltest/dcfmtest.cpp ---- orig.icu/source/test/intltest/dcfmtest.cpp 2015-10-08 05:52:10.000000000 +0200 -+++ icu/source/test/intltest/dcfmtest.cpp 2015-10-27 19:40:27.537963317 +0100 +diff -ru orig.icu/source/test/intltest/dcfmtest.cpp icu/source/test/intltest/dcfmtest.cpp +--- orig.icu/source/test/intltest/dcfmtest.cpp 2016-03-23 21:48:38.000000000 +0100 ++++ icu/source/test/intltest/dcfmtest.cpp 2016-04-15 18:34:06.148251985 +0200 @@ -279,6 +279,13 @@ // formatLineMat.reset(testLine); @@ -31,9 +31,9 @@ diff -ur orig.icu/source/test/intltest/dcfmtest.cpp icu/source/test/intltest/dcf execFormatTest(lineNum, formatLineMat.group(1, status), // Pattern formatLineMat.group(2, status), // rounding mode -diff -ur orig.icu/source/test/intltest/numfmtspectest.cpp icu/source/test/intltest/numfmtspectest.cpp ---- orig.icu/source/test/intltest/numfmtspectest.cpp 2015-10-08 05:52:10.000000000 +0200 -+++ icu/source/test/intltest/numfmtspectest.cpp 2015-10-27 19:41:47.660444972 +0100 +diff -ru orig.icu/source/test/intltest/numfmtspectest.cpp icu/source/test/intltest/numfmtspectest.cpp +--- orig.icu/source/test/intltest/numfmtspectest.cpp 2016-03-23 21:48:40.000000000 +0100 ++++ icu/source/test/intltest/numfmtspectest.cpp 2016-04-15 18:34:06.148251985 +0200 @@ -137,11 +137,14 @@ void NumberFormatSpecificationTest::TestScientificNotation() { @@ -66,10 +66,10 @@ diff -ur orig.icu/source/test/intltest/numfmtspectest.cpp icu/source/test/intlte } void NumberFormatSpecificationTest::assertPatternFr( -diff -ur orig.icu/source/test/intltest/numfmtst.cpp icu/source/test/intltest/numfmtst.cpp ---- orig.icu/source/test/intltest/numfmtst.cpp 2015-10-08 05:52:12.000000000 +0200 -+++ icu/source/test/intltest/numfmtst.cpp 2015-10-27 19:40:27.539963329 +0100 -@@ -729,6 +729,12 @@ +diff -ru orig.icu/source/test/intltest/numfmtst.cpp icu/source/test/intltest/numfmtst.cpp +--- orig.icu/source/test/intltest/numfmtst.cpp 2016-03-23 21:48:40.000000000 +0100 ++++ icu/source/test/intltest/numfmtst.cpp 2016-04-15 18:34:06.150251997 +0200 +@@ -730,6 +730,12 @@ void NumberFormatTest::TestExponential(void) { @@ -82,7 +82,7 @@ diff -ur orig.icu/source/test/intltest/numfmtst.cpp icu/source/test/intltest/num UErrorCode status = U_ZERO_ERROR; DecimalFormatSymbols sym(Locale::getUS(), status); if (U_FAILURE(status)) { errcheckln(status, "FAIL: Bad status returned by DecimalFormatSymbols ct - %s", u_errorName(status)); return; } -@@ -1847,8 +1853,11 @@ +@@ -1846,8 +1852,11 @@ (int32_t) 45678000, "5E7", status); expect(new DecimalFormat("00E0", US, status), (int32_t) 45678000, "46E6", status); diff --git a/icu.7601.Indic-ccmp.patch b/icu.7601.Indic-ccmp.patch index 328a285..9de5a45 100644 --- a/icu.7601.Indic-ccmp.patch +++ b/icu.7601.Indic-ccmp.patch @@ -1,5 +1,6 @@ ---- icu/source/layout/IndicReordering.cpp 2009-07-01 20:51:26.000000000 +0200 -+++ icu/source/layout/IndicReordering.cpp 2011-01-08 11:12:49.950566538 +0100 +diff -ru orig.icu/source/layout/IndicReordering.cpp icu/source/layout/IndicReordering.cpp +--- orig.icu/source/layout/IndicReordering.cpp 2016-04-15 18:30:15.788856946 +0200 ++++ icu/source/layout/IndicReordering.cpp 2016-04-15 18:30:39.244998995 +0200 @@ -13,6 +13,7 @@ U_NAMESPACE_BEGIN @@ -25,7 +26,7 @@ #define positioningFormsMask ( kernFeatureMask | distFeatureMask | abvmFeatureMask | blwmFeatureMask ) #define presentationFormsMask ( presFeatureMask | abvsFeatureMask | blwsFeatureMask | pstsFeatureMask | halnFeatureMask | caltFeatureMask ) -@@ -480,6 +482,7 @@ +@@ -484,6 +486,7 @@ #define tagArray0 (rphfFeatureMask | tagArray1) static const FeatureMap featureMap[] = { @@ -33,7 +34,7 @@ {loclFeatureTag, loclFeatureMask}, {initFeatureTag, initFeatureMask}, {nuktFeatureTag, nuktFeatureMask}, -@@ -502,6 +505,7 @@ +@@ -506,6 +509,7 @@ static const le_int32 featureCount = LE_ARRAY_SIZE(featureMap); static const FeatureMap v2FeatureMap[] = { diff --git a/icu.8800.freeserif.crash.patch b/icu.8800.freeserif.crash.patch index 04278d3..6d8061a 100644 --- a/icu.8800.freeserif.crash.patch +++ b/icu.8800.freeserif.crash.patch @@ -1,11 +1,11 @@ diff -ru orig.icu/source/layout/LookupProcessor.cpp icu/source/layout/LookupProcessor.cpp ---- orig.icu/source/layout/LookupProcessor.cpp 2013-04-18 23:32:30.000000000 +0200 -+++ icu/source/layout/LookupProcessor.cpp 2013-07-17 01:09:57.792635999 +0200 -@@ -220,7 +220,9 @@ +--- orig.icu/source/layout/LookupProcessor.cpp 2016-03-23 21:56:44.000000000 +0100 ++++ icu/source/layout/LookupProcessor.cpp 2016-04-15 18:19:26.903927005 +0200 +@@ -223,7 +223,9 @@ if (requiredFeatureIndex != 0xFFFF) { requiredFeatureTable = featureListTable->getFeatureTable(featureListTable, requiredFeatureIndex, &requiredFeatureTag, success); -- featureReferences += SWAPW(featureTable->lookupCount); +- featureReferences += SWAPW(requiredFeatureTable->lookupCount); + if (requiredFeatureTable.isValid()) { + featureReferences += SWAPW(requiredFeatureTable->lookupCount); + } diff --git a/icu.spec b/icu.spec index 7b5188f..8591b2d 100644 --- a/icu.spec +++ b/icu.spec @@ -1,13 +1,13 @@ #%%global debugtrace 1 Name: icu -Version: 56.1 -Release: 7%{?dist} +Version: 57.1 +Release: 1%{?dist} Summary: International Components for Unicode License: MIT and UCD and Public Domain URL: http://www.icu-project.org/ -Source0: http://download.icu-project.org/files/icu4c/56.1/icu4c-56_1-src.tgz +Source0: http://download.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.tgz Source1: icu-config.sh BuildRequires: doxygen, autoconf, python @@ -143,7 +143,7 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l %files %license license.html -%exclude %{_datadir}/%{name}/*/license.html +%exclude %{_datadir}/%{name}/*/LICENSE %{_bindir}/derb %{_bindir}/genbrk %{_bindir}/gencfu @@ -166,12 +166,12 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l %{_mandir}/man8/*.8* %files -n lib%{name} -%license license.html +%license LICENSE %doc readme.html %{_libdir}/*.so.* %files -n lib%{name}-devel -%license license.html +%license LICENSE %doc source/samples/ %{_bindir}/%{name}-config* %{_bindir}/icuinfo @@ -189,14 +189,17 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l %{_datadir}/%{name}/%{version}/config %files -n lib%{name}-doc -%license license.html +%license LICENSE %doc readme.html %doc source/__docs/%{name}/html/* %changelog +* Fri Apr 15 2016 Eike Rathke - 57.1-1 +- upgrade to upstream ICU 57.1 + * Tue Apr 05 2016 Eike Rathke - 56.1-7 -- make check failure is fatal again, still fails in rawhide/f25 i686 +- make check failure is fatal again * Tue Apr 05 2016 Eike Rathke - 56.1-6 - remove icu-56.1-codes-cache-extend.patch diff --git a/sources b/sources index bd5a1cf..e3d8a75 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c4a2d71ff56aec5ebfab2a3f059be99d icu4c-56_1-src.tgz +976734806026a4ef8bdd17937c8898b9 icu4c-57_1-src.tgz d0cd9a661a7afb5f9a82bbc6a7897930 icu-config.sh