From 9b8cd86eea5333c269cb547b1686962a38a14f9d57bba4929797b862a4dde1a2 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 16 Jun 2014 08:37:21 +0000 Subject: [PATCH] - add icu-fix-tests-depending-on-date.patch to fix build see http://sourceforge.net/p/icu/mailman/message/32443311/ OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=48 --- icu-fix-tests-depending-on-date.patch | 15 +++++++++++++++ icu.changes | 6 ++++++ icu.spec | 3 ++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 icu-fix-tests-depending-on-date.patch diff --git a/icu-fix-tests-depending-on-date.patch b/icu-fix-tests-depending-on-date.patch new file mode 100644 index 0000000..9c1528e --- /dev/null +++ b/icu-fix-tests-depending-on-date.patch @@ -0,0 +1,15 @@ +See icu-fix-tests-depending-on-date.patch + +Index: icu/source/test/intltest/dtfmttst.cpp +=================================================================== +--- icu.orig/source/test/intltest/dtfmttst.cpp ++++ icu/source/test/intltest/dtfmttst.cpp +@@ -1132,7 +1132,7 @@ DateFormatTest::TestTwoDigitYear() + 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.changes b/icu.changes index 771b24e..6a93cd2 100644 --- a/icu.changes +++ b/icu.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 16 08:31:20 UTC 2014 - coolo@suse.com + +- add icu-fix-tests-depending-on-date.patch to fix build + see http://sourceforge.net/p/icu/mailman/message/32443311/ + ------------------------------------------------------------------- Tue Jun 3 13:23:12 UTC 2014 - tchvatal@suse.com diff --git a/icu.spec b/icu.spec index 70c02a8..e1299cd 100644 --- a/icu.spec +++ b/icu.spec @@ -33,6 +33,7 @@ Patch1: icu-rpmlint.diff Patch2: icu-remove-datetime.patch Patch3: icu-versioning.diff Patch4: icu-fix-install-mode-files.diff +Patch5: icu-fix-tests-depending-on-date.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkg-config @@ -119,7 +120,7 @@ cd html unzip %SOURCE2 cd .. -%patch -P 1 -P 2 -P 3 -P 4 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -p1 -P 5 -p1 %build cd source