Bump to icu 57.1 46/72446/1 accepted/tizen/common/20160703.183610 accepted/tizen/ivi/20160616.002105 accepted/tizen/mobile/20160616.002029 accepted/tizen/tv/20160616.002059 accepted/tizen/wearable/20160616.002020 submit/tizen/20160615.020349 submit/tizen_common/20160703.163500
authorDongHun Kwak <dh0128.kwak@samsung.com>
Mon, 30 May 2016 08:57:59 +0000 (17:57 +0900)
committerDongHun Kwak <dh0128.kwak@samsung.com>
Wed, 1 Jun 2016 05:24:21 +0000 (14:24 +0900)
[Model] ALL
[BinType] AP
[Customer] OPEN

[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A

[Problem] Bump to icu 57.1
[Cause & Measure]
[Checking Method] N/A

[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A

Change-Id: I3bb65d682ff7eed5ae34c6316e3603acb94d9d56
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
packaging/icu.spec
source/data/locales/en_GB.txt [deleted file]
source/i18n/timezone.cpp
source/i18n/unicode/timezone.h
source/tools/genrb/Makefile.in
source/tools/makeconv/Makefile.in

index 27307f7..e444151 100644 (file)
@@ -1,12 +1,17 @@
+%define run_tests 0
+%if %{run_tests}
+    # check is defined off at .rpmmacros file.
+    %define check %%check
+%endif
+
 Name:      icu
-Version:   54.1
+Version:   57.1
 Release:   1
 Summary:   International Components for Unicode
 Group:     System/Libraries
 License:   ICU and Unicode-TOU and BSD-3-Clause
 URL:       http://www.icu-project.org/
-%define tar_version 54.1
-Source0:   %{name}-%{tar_version}.tar.gz
+Source0:   %{name}-%{version}.tar.gz
 Source1001:    icu.manifest
 BuildRequires: doxygen
 BuildRequires: autoconf
@@ -46,9 +51,17 @@ cd source
 %configure --disable-static \
             --disable-renaming \
             --enable-shared \
+            --enable-plugins \
             --disable-samples
 make %{?_smp_mflags}
 
+%check
+%if %{run_tests}
+    pushd source
+    %__make check || exit 0
+    popd
+%endif
+
 %install
 cd source
 %make_install
@@ -84,7 +97,7 @@ chmod +x %{buildroot}/%{_libdir}/lib*.so.*
 %dir %{_datadir}/icu/%{version}
 %{_datadir}/icu/%{version}/config/mh-linux
 %{_datadir}/icu/%{version}/install-sh
-%{_datadir}/icu/%{version}/license.html
+%{_datadir}/icu/%{version}/LICENSE
 %{_datadir}/icu/%{version}/mkinstalldirs
 
 %files -n libicu-devel
diff --git a/source/data/locales/en_GB.txt b/source/data/locales/en_GB.txt
deleted file mode 100644 (file)
index 51d2c0d..0000000
+++ /dev/null
@@ -1,805 +0,0 @@
-// ***************************************************************************\r
-// *\r
-// * Copyright (C) 2014 International Business Machines\r
-// * Corporation and others. All Rights Reserved.\r
-// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter\r
-// * Source File: <path>/common/main/en_GB.xml\r
-// *\r
-// ***************************************************************************\r
-en_GB{\r
-    %%Parent{"en_001"}\r
-    Ellipsis{\r
-        final{"{0}…"}\r
-        initial{"…{0}"}\r
-        medial{"{0}… {1}"}\r
-        word-final{"{0} …"}\r
-        word-initial{"… {0}"}\r
-        word-medial{"{0} … {1}"}\r
-    }\r
-    MoreInformation{"?"}\r
-    NumberElements{\r
-        default{"latn"}\r
-        latn{\r
-            miscPatterns{\r
-                range{"{0}–{1}"}\r
-            }\r
-            symbols{\r
-                timeSeparator{":"}\r
-            }\r
-        }\r
-        minimumGroupingDigits{"1"}\r
-        native{"latn"}\r
-    }\r
-    Version{"2.1.8.19"}\r
-    calendar{\r
-        chinese{\r
-            DateTimePatterns{\r
-                "HH:mm:ss zzzz",\r
-                "HH:mm:ss z",\r
-                "HH:mm:ss",\r
-                "HH:mm",\r
-                "EEEE, d MMMM U",\r
-                "d MMMM U",\r
-                "d MMM U",\r
-                "dd/MM/yy",\r
-                "{1} {0}",\r
-                "{1} {0}",\r
-                "{1} {0}",\r
-                "{1} {0}",\r
-                "{1} {0}",\r
-            }\r
-            availableFormats{\r
-                Ed{"E d"}\r
-                GyMMMEd{"E, d MMM U"}\r
-                GyMMMd{"d MMM U"}\r
-                M{"LL"}\r
-                MEd{"E dd/MM"}\r
-                MMMEd{"E d MMM"}\r
-                MMMMd{"d MMMM"}\r
-                MMMd{"d MMM"}\r
-                Md{"dd/MM"}\r
-                yMd{"dd/MM/y"}\r
-                yyyyM{"MM/y"}\r
-                yyyyMEd{"E, dd/MM/y"}\r
-                yyyyMMMEd{"E, d MMM U"}\r
-                yyyyMMMM{"MMMM U"}\r
-                yyyyMMMd{"d MMM U"}\r
-                yyyyMd{"dd/MM/y"}\r
-            }\r
-            intervalFormats{\r
-                H{\r
-                    H{"HH–HH"}\r
-                }\r
-                Hm{\r
-                    H{"HH:mm–HH:mm"}\r
-                    m{"HH:mm–HH:mm"}\r
-                }\r
-                Hmv{\r
-                    H{"HH:mm–HH:mm v"}\r
-                    m{"HH:mm–HH:mm v"}\r
-                }\r
-                Hv{\r
-                    H{"HH–HH v"}\r
-                }\r
-                M{\r
-                    M{"M–M"}\r
-                }\r
-                MEd{\r
-                    M{"E dd/MM – E dd/MM"}\r
-                    d{"E dd/MM – E dd/MM"}\r
-                }\r
-                MMM{\r
-                    M{"MMM–MMM"}\r
-                }\r
-                MMMEd{\r
-                    M{"E d MMM – E d MMM"}\r
-                    d{"E d – E d MMM"}\r
-                }\r
-                MMMd{\r
-                    M{"d MMM – d MMM"}\r
-                    d{"d–d MMM"}\r
-                }\r
-                Md{\r
-                    M{"dd/MM – dd/MM"}\r
-                    d{"dd/MM – dd/MM"}\r
-                }\r
-                d{\r
-                    d{"d–d"}\r
-                }\r
-                h{\r
-                    h{"h–h a"}\r
-                }\r
-                hm{\r
-                    h{"h:mm–h:mm a"}\r
-                    m{"h:mm–h:mm a"}\r
-                }\r
-                hmv{\r
-                    h{"h:mm–h:mm a v"}\r
-                    m{"h:mm–h:mm a v"}\r
-                }\r
-                hv{\r
-                    h{"h–h a v"}\r
-                }\r
-                y{\r
-                    y{"U-U"}\r
-                }\r
-                yM{\r
-                    M{"MM/y – MM/y"}\r
-                    y{"MM/y – MM/y"}\r
-                }\r
-                yMEd{\r
-                    M{"E, dd/MM/y – E, dd/MM/y"}\r
-                    d{"E, dd/MM/y – E, dd/MM/y"}\r
-                    y{"E, dd/MM/y – E, dd/MM/y"}\r
-                }\r
-                yMMM{\r
-                    M{"MMM–MMM U"}\r
-                }\r
-                yMMMEd{\r
-                    M{"E, d MMM – E, d MMM U"}\r
-                    d{"E, d – E, d MMM U"}\r
-                    y{"E, d MMM U – E, d MMM U"}\r
-                }\r
-                yMMMM{\r
-                    M{"MMMM–MMMM U"}\r
-                }\r
-                yMMMd{\r
-                    M{"d MMM – d MMM U"}\r
-                    d{"d–d MMM U"}\r
-                    y{"d MMM U – d MMM U"}\r
-                }\r
-                yMd{\r
-                    M{"dd/MM/y – dd/MM/y"}\r
-                    d{"dd/MM/y – dd/MM/y"}\r
-                    y{"dd/MM/y – dd/MM/y"}\r
-                }\r
-            }\r
-            monthNames{\r
-                format{\r
-                    narrow{\r
-                        "1",\r
-                        "2",\r
-                        "3",\r
-                        "4",\r
-                        "5",\r
-                        "6",\r
-                        "7",\r
-                        "8",\r
-                        "9",\r
-                        "10",\r
-                        "11",\r
-                        "12",\r
-                    }\r
-                }\r
-                stand-alone{\r
-                    narrow{\r
-                        "1",\r
-                        "2",\r
-                        "3",\r
-                        "4",\r
-                        "5",\r
-                        "6",\r
-                        "7",\r
-                        "8",\r
-                        "9",\r
-                        "10",\r
-                        "11",\r
-                        "12",\r
-                    }\r
-                }\r
-            }\r
-        }\r
-        generic{\r
-            DateTimePatterns{\r
-                "HH:mm:ss zzzz",\r
-                "HH:mm:ss z",\r
-                "HH:mm:ss",\r
-                "HH:mm",\r
-                "EEEE, d MMMM y G",\r
-                "d MMMM y G",\r
-                "d MMM y G",\r
-                "dd/MM/y GGGGG",\r
-                "{1} {0}",\r
-                "{1} {0}",\r
-                "{1} {0}",\r
-                "{1} {0}",\r
-                "{1} {0}",\r
-            }\r
-            availableFormats{\r
-                Ed{"E d"}\r
-                GyMMMEd{"E, d MMM y G"}\r
-                GyMMMd{"d MMM y G"}\r
-                M{"LL"}\r
-                MEd{"E dd/MM"}\r
-                MMMEd{"E d MMM"}\r
-                MMMMd{"d MMMM"}\r
-                MMMd{"d MMM"}\r
-                Md{"dd/MM"}\r
-                yyyyM{"MM/y GGGGG"}\r
-                yyyyMEd{"E, dd/MM/y GGGGG"}\r
-                yyyyMMMEd{"E, d MMM y G"}\r
-                yyyyMMMM{"MMMM y G"}\r
-                yyyyMMMd{"d MMM y G"}\r
-                yyyyMd{"dd/MM/y GGGGG"}\r
-            }\r
-            intervalFormats{\r
-                H{\r
-                    H{"HH–HH"}\r
-                }\r
-                Hm{\r
-                    H{"HH:mm–HH:mm"}\r
-                    m{"HH:mm–HH:mm"}\r
-                }\r
-                Hmv{\r
-                    H{"HH:mm–HH:mm v"}\r
-                    m{"HH:mm–HH:mm v"}\r
-                }\r
-                Hv{\r
-                    H{"HH–HH v"}\r
-                }\r
-                M{\r
-                    M{"M–M"}\r
-                }\r
-                MEd{\r
-                    M{"E dd/MM – E dd/MM"}\r
-                    d{"E dd/MM – E dd/MM"}\r
-                }\r
-                MMM{\r
-                    M{"MMM–MMM"}\r
-                }\r
-                MMMEd{\r
-                    M{"E d MMM – E d MMM"}\r
-                    d{"E d – E d MMM"}\r
-                }\r
-                MMMd{\r
-                    M{"d MMM – d MMM"}\r
-                    d{"d–d MMM"}\r
-                }\r
-                Md{\r
-                    M{"dd/MM – dd/MM"}\r
-                    d{"dd/MM – dd/MM"}\r
-                }\r
-                d{\r
-                    d{"d–d"}\r
-                }\r
-                h{\r
-                    h{"h–h a"}\r
-                }\r
-                hm{\r
-                    h{"h:mm–h:mm a"}\r
-                    m{"h:mm–h:mm a"}\r
-                }\r
-                hmv{\r
-                    h{"h:mm–h:mm a v"}\r
-                    m{"h:mm–h:mm a v"}\r
-                }\r
-                hv{\r
-                    h{"h–h a v"}\r
-                }\r
-                y{\r
-                    y{"y-y G"}\r
-                }\r
-                yM{\r
-                    M{"MM/y – MM/y GGGGG"}\r
-                    y{"MM/y – MM/y GGGGG"}\r
-                }\r
-                yMEd{\r
-                    M{"E, dd/MM/y – E, dd/MM/y GGGGG"}\r
-                    d{"E, dd/MM/y – E, dd/MM/y GGGGG"}\r
-                    y{"E, dd/MM/y – E, dd/MM/y GGGGG"}\r
-                }\r
-                yMMM{\r
-                    M{"MMM–MMM y G"}\r
-                }\r
-                yMMMEd{\r
-                    M{"E, d MMM – E, d MMM y G"}\r
-                    d{"E, d – E, d MMM y G"}\r
-                    y{"E, d MMM y – E, d MMM y G"}\r
-                }\r
-                yMMMM{\r
-                    M{"MMMM–MMMM y G"}\r
-                }\r
-                yMMMd{\r
-                    M{"d MMM – d MMM y G"}\r
-                    d{"d–d MMM y G"}\r
-                    y{"d MMM y – d MMM y G"}\r
-                }\r
-                yMd{\r
-                    M{"dd/MM/y – dd/MM/y GGGGG"}\r
-                    d{"dd/MM/y – dd/MM/y GGGGG"}\r
-                    y{"dd/MM/y – dd/MM/y GGGGG"}\r
-                }\r
-            }\r
-        }\r
-        gregorian{\r
-            AmPmMarkers{\r
-                "a.m.",\r
-                "p.m.",\r
-            }\r
-            DateTimePatterns{\r
-                "HH:mm:ss zzzz",\r
-                "HH:mm:ss z",\r
-                "HH:mm:ss",\r
-                "HH:mm",\r
-                "EEEE, d MMMM y",\r
-                "d MMMM y",\r
-                "d MMM y",\r
-                "dd/MM/y",\r
-                "{1}, {0}",\r
-                "{1} 'at' {0}",\r
-                "{1} 'at' {0}",\r
-                "{1}, {0}",\r
-                "{1}, {0}",\r
-            }\r
-            availableFormats{\r
-                GyMMMEd{"E, d MMM y G"}\r
-                GyMMMd{"d MMM y G"}\r
-                MEd{"E dd/MM"}\r
-                MMMEd{"E d MMM"}\r
-                MMMMd{"d MMMM"}\r
-                MMMd{"d MMM"}\r
-                MMdd{"dd/MM"}\r
-                Md{"dd/MM"}\r
-                yM{"MM/y"}\r
-                yMEd{"E, dd/MM/y"}\r
-                yMMMEd{"E, d MMM y"}\r
-                yMMMM{"MMMM y"}\r
-                yMMMd{"d MMM y"}\r
-                yMd{"dd/MM/y"}\r
-            }\r
-            intervalFormats{\r
-                H{\r
-                    H{"HH–HH"}\r
-                }\r
-                Hm{\r
-                    H{"HH:mm–HH:mm"}\r
-                    m{"HH:mm–HH:mm"}\r
-                }\r
-                Hmv{\r
-                    H{"HH:mm–HH:mm v"}\r
-                    m{"HH:mm–HH:mm v"}\r
-                }\r
-                Hv{\r
-                    H{"HH–HH v"}\r
-                }\r
-                M{\r
-                    M{"M–M"}\r
-                }\r
-                MEd{\r
-                    M{"E dd/MM – E dd/MM"}\r
-                    d{"E dd/MM – E dd/MM"}\r
-                }\r
-                MMM{\r
-                    M{"MMM–MMM"}\r
-                }\r
-                MMMEd{\r
-                    M{"E d MMM – E d MMM"}\r
-                    d{"E d – E d MMM"}\r
-                }\r
-                MMMd{\r
-                    M{"d MMM – d MMM"}\r
-                    d{"d–d MMM"}\r
-                }\r
-                Md{\r
-                    M{"dd/MM – dd/MM"}\r
-                    d{"dd/MM – dd/MM"}\r
-                }\r
-                d{\r
-                    d{"d–d"}\r
-                }\r
-                h{\r
-                    h{"h–h a"}\r
-                }\r
-                hm{\r
-                    h{"h:mm–h:mm a"}\r
-                    m{"h:mm–h:mm a"}\r
-                }\r
-                hmv{\r
-                    h{"h:mm–h:mm a v"}\r
-                    m{"h:mm–h:mm a v"}\r
-                }\r
-                hv{\r
-                    h{"h–h a v"}\r
-                }\r
-                y{\r
-                    y{"y-y"}\r
-                }\r
-                yM{\r
-                    M{"MM/y – MM/y"}\r
-                    y{"MM/y – MM/y"}\r
-                }\r
-                yMEd{\r
-                    M{"E, dd/MM/y – E, dd/MM/y"}\r
-                    d{"E, dd/MM/y – E, dd/MM/y"}\r
-                    y{"E, dd/MM/y – E, dd/MM/y"}\r
-                }\r
-                yMMM{\r
-                    M{"MMM–MMM y"}\r
-                }\r
-                yMMMEd{\r
-                    M{"E, d MMM – E, d MMM y"}\r
-                    d{"E, d – E, d MMM y"}\r
-                    y{"E, d MMM y – E, d MMM y"}\r
-                }\r
-                yMMMM{\r
-                    M{"MMMM–MMMM y"}\r
-                }\r
-                yMMMd{\r
-                    M{"d MMM – d MMM y"}\r
-                    d{"d–d MMM y"}\r
-                    y{"d MMM y – d MMM y"}\r
-                }\r
-                yMd{\r
-                    M{"dd/MM/y – dd/MM/y"}\r
-                    d{"dd/MM/y – dd/MM/y"}\r
-                    y{"dd/MM/y – dd/MM/y"}\r
-                }\r
-            }\r
-        }\r
-        indian{\r
-            eras{\r
-                abbreviated{\r
-                    "SAKA",\r
-                }\r
-            }\r
-            monthNames{\r
-                format{\r
-                    abbreviated{\r
-                        "Chaitra",\r
-                        "Vaisakha",\r
-                        "Jyaistha",\r
-                        "Asadha",\r
-                        "Sravana",\r
-                        "Bhadra",\r
-                        "Asvina",\r
-                        "Kartika",\r
-                        "Agrahayana",\r
-                        "Pausa",\r
-                        "Magha",\r
-                        "Phalguna",\r
-                    }\r
-                    narrow{\r
-                        "1",\r
-                        "2",\r
-                        "3",\r
-                        "4",\r
-                        "5",\r
-                        "6",\r
-                        "7",\r
-                        "8",\r
-                        "9",\r
-                        "10",\r
-                        "11",\r
-                        "12",\r
-                    }\r
-                    wide{\r
-                        "Chaitra",\r
-                        "Vaisakha",\r
-                        "Jyaistha",\r
-                        "Asadha",\r
-                        "Sravana",\r
-                        "Bhadra",\r
-                        "Asvina",\r
-                        "Kartika",\r
-                        "Agrahayana",\r
-                        "Pausa",\r
-                        "Magha",\r
-                        "Phalguna",\r
-                    }\r
-                }\r
-                stand-alone{\r
-                    abbreviated{\r
-                        "Chaitra",\r
-                        "Vaisakha",\r
-                        "Jyaistha",\r
-                        "Asadha",\r
-                        "Sravana",\r
-                        "Bhadra",\r
-                        "Asvina",\r
-                        "Kartika",\r
-                        "Agrahayana",\r
-                        "Pausa",\r
-                        "Magha",\r
-                        "Phalguna",\r
-                    }\r
-                    narrow{\r
-                        "1",\r
-                        "2",\r
-                        "3",\r
-                        "4",\r
-                        "5",\r
-                        "6",\r
-                        "7",\r
-                        "8",\r
-                        "9",\r
-                        "10",\r
-                        "11",\r
-                        "12",\r
-                    }\r
-                    wide{\r
-                        "Chaitra",\r
-                        "Vaisakha",\r
-                        "Jyaistha",\r
-                        "Asadha",\r
-                        "Sravana",\r
-                        "Bhadra",\r
-                        "Asvina",\r
-                        "Kartika",\r
-                        "Agrahayana",\r
-                        "Pausa",\r
-                        "Magha",\r
-                        "Phalguna",\r
-                    }\r
-                }\r
-            }\r
-        }\r
-        islamic{\r
-            DateTimePatterns{\r
-                "HH:mm:ss zzzz",\r
-                "HH:mm:ss z",\r
-                "HH:mm:ss",\r
-                "HH:mm",\r
-                "EEEE, d MMMM y G",\r
-                "d MMMM y G",\r
-                "d MMM y G",\r
-                "dd/MM/y GGGGG",\r
-                "{1} {0}",\r
-                "{1} {0}",\r
-                "{1} {0}",\r
-                "{1} {0}",\r
-                "{1} {0}",\r
-            }\r
-            availableFormats{\r
-                Ed{"E d"}\r
-                GyMMMEd{"E, d MMM y G"}\r
-                GyMMMd{"d MMM y G"}\r
-                M{"LL"}\r
-                MEd{"E dd/MM"}\r
-                MMMEd{"E d MMM"}\r
-                MMMMd{"d MMMM"}\r
-                MMMd{"d MMM"}\r
-                Md{"dd/MM"}\r
-                yyyyM{"MM/y GGGGG"}\r
-                yyyyMEd{"E, dd/MM/y GGGGG"}\r
-                yyyyMMMEd{"E, d MMM y G"}\r
-                yyyyMMMM{"MMMM y G"}\r
-                yyyyMMMd{"d MMM y G"}\r
-                yyyyMd{"dd/MM/y GGGGG"}\r
-            }\r
-            monthNames{\r
-                format{\r
-                    abbreviated{\r
-                        "Muh.",\r
-                        "Saf.",\r
-                        "Rab. I",\r
-                        "Rab. II",\r
-                        "Jum. I",\r
-                        "Jum. II",\r
-                        "Raj.",\r
-                        "Sha.",\r
-                        "Ram.",\r
-                        "Shaw.",\r
-                        "Dhuʻl-Q.",\r
-                        "Dhuʻl-H.",\r
-                    }\r
-                    narrow{\r
-                        "1",\r
-                        "2",\r
-                        "3",\r
-                        "4",\r
-                        "5",\r
-                        "6",\r
-                        "7",\r
-                        "8",\r
-                        "9",\r
-                        "10",\r
-                        "11",\r
-                        "12",\r
-                    }\r
-                    wide{\r
-                        "Muharram",\r
-                        "Safar",\r
-                        "Rabiʻ I",\r
-                        "Rabiʻ II",\r
-                        "Jumada I",\r
-                        "Jumada II",\r
-                        "Rajab",\r
-                        "Shaʻban",\r
-                        "Ramadan",\r
-                        "Shawwal",\r
-                        "Dhuʻl-Qiʻdah",\r
-                        "Dhuʻl-Hijjah",\r
-                    }\r
-                }\r
-                stand-alone{\r
-                    abbreviated{\r
-                        "Muh.",\r
-                        "Saf.",\r
-                        "Rab. I",\r
-                        "Rab. II",\r
-                        "Jum. I",\r
-                        "Jum. II",\r
-                        "Raj.",\r
-                        "Sha.",\r
-                        "Ram.",\r
-                        "Shaw.",\r
-                        "Dhuʻl-Q.",\r
-                        "Dhuʻl-H.",\r
-                    }\r
-                    narrow{\r
-                        "1",\r
-                        "2",\r
-                        "3",\r
-                        "4",\r
-                        "5",\r
-                        "6",\r
-                        "7",\r
-                        "8",\r
-                        "9",\r
-                        "10",\r
-                        "11",\r
-                        "12",\r
-                    }\r
-                    wide{\r
-                        "Muharram",\r
-                        "Safar",\r
-                        "Rabiʻ I",\r
-                        "Rabiʻ II",\r
-                        "Jumada I",\r
-                        "Jumada II",\r
-                        "Rajab",\r
-                        "Shaʻban",\r
-                        "Ramadan",\r
-                        "Shawwal",\r
-                        "Dhuʻl-Qiʻdah",\r
-                        "Dhuʻl-Hijjah",\r
-                    }\r
-                }\r
-            }\r
-        }\r
-        japanese{\r
-            DateTimePatterns{\r
-                "HH:mm:ss zzzz",\r
-                "HH:mm:ss z",\r
-                "HH:mm:ss",\r
-                "HH:mm",\r
-                "EEEE, d MMMM y G",\r
-                "d MMMM y G",\r
-                "d MMM y G",\r
-                "dd/MM/y GGGGG",\r
-                "{1} {0}",\r
-                "{1} {0}",\r
-                "{1} {0}",\r
-                "{1} {0}",\r
-                "{1} {0}",\r
-            }\r
-        }\r
-    }\r
-    durationUnits{\r
-        hm{"h:mm"}\r
-        hms{"h:mm:ss"}\r
-        ms{"m:ss"}\r
-    }\r
-    fields{\r
-        day-narrow{\r
-            relativeTime{\r
-                future{\r
-                    one{"+{0} day"}\r
-                    other{"+{0} days"}\r
-                }\r
-                past{\r
-                    one{"-{0} day"}\r
-                    other{"-{0} days"}\r
-                }\r
-            }\r
-        }\r
-        day-short{\r
-            relativeTime{\r
-                future{\r
-                    one{"in {0} day"}\r
-                    other{"in {0} days"}\r
-                }\r
-                past{\r
-                    one{"{0} day ago"}\r
-                    other{"{0} days ago"}\r
-                }\r
-            }\r
-        }\r
-        dayperiod{\r
-            dn{"a.m./p.m."}\r
-        }\r
-        hour-narrow{\r
-            dn{"h"}\r
-            relativeTime{\r
-                future{\r
-                    one{"+{0} h"}\r
-                    other{"+{0} h"}\r
-                }\r
-                past{\r
-                    one{"-{0} h"}\r
-                    other{"-{0} h"}\r
-                }\r
-            }\r
-        }\r
-        minute-narrow{\r
-            relativeTime{\r
-                future{\r
-                    one{"+{0} m"}\r
-                    other{"+{0} m"}\r
-                }\r
-                past{\r
-                    one{"-{0} m"}\r
-                    other{"-{0} m"}\r
-                }\r
-            }\r
-        }\r
-        month-narrow{\r
-            relativeTime{\r
-                future{\r
-                    one{"+{0} mo."}\r
-                    other{"+{0} mo."}\r
-                }\r
-                past{\r
-                    one{"-{0} mo."}\r
-                    other{"-{0} mo."}\r
-                }\r
-            }\r
-        }\r
-        quarter-narrow{\r
-            relativeTime{\r
-                future{\r
-                    one{"+{0} Q"}\r
-                    other{"+{0} Q"}\r
-                }\r
-                past{\r
-                    one{"-{0} Q"}\r
-                    other{"-{0} Q"}\r
-                }\r
-            }\r
-        }\r
-        second-narrow{\r
-            relativeTime{\r
-                future{\r
-                    one{"+{0} s"}\r
-                    other{"+{0} s"}\r
-                }\r
-                past{\r
-                    one{"-{0} s ago"}\r
-                    other{"-{0} s ago"}\r
-                }\r
-            }\r
-        }\r
-        week-narrow{\r
-            relativeTime{\r
-                future{\r
-                    one{"+{0} wk."}\r
-                    other{"+{0} wk."}\r
-                }\r
-                past{\r
-                    one{"-{0} wk."}\r
-                    other{"-{0} wk."}\r
-                }\r
-            }\r
-        }\r
-        year-narrow{\r
-            relativeTime{\r
-                future{\r
-                    one{"+{0} yr."}\r
-                    other{"+{0} yr."}\r
-                }\r
-                past{\r
-                    one{"-{0} yr."}\r
-                    other{"-{0} yr."}\r
-                }\r
-            }\r
-        }\r
-    }\r
-    listPattern{\r
-        standard{\r
-            end{"{0} and {1}"}\r
-        }\r
-        unit{\r
-            end{"{0} and {1}"}\r
-        }\r
-    }\r
-}\r
index 1952902..59c3891 100644 (file)
@@ -458,8 +458,6 @@ TimeZone::detectHostTimeZone()
 
     uprv_tzset(); // Initialize tz... system data
 
-    uprv_tzname_clear_cache();
-
     // Get the timezone ID from the host.  This function should do
     // any required host-specific remapping; e.g., on Windows this
     // function maps the Date and Time control panel setting to an
@@ -547,21 +545,6 @@ static void U_CALLCONV initDefault()
 
     TimeZone *default_zone = TimeZone::detectHostTimeZone();
 
-    // NOTE:  this code is safely single threaded, being only
-    // run via umtx_initOnce().
-    //
-    // Some of the locale/timezone OS functions may not be thread safe,
-    //
-    // The operating system might actually use ICU to implement timezones.
-    // So we may have ICU calling ICU here, like on AIX.
-    // There shouldn't be a problem with this; initOnce does not hold a mutex
-    // while the init function is being run.
-
-    // The code detecting the host time zone was separated from this
-    // and implemented as TimeZone::detectHostTimeZone()
-
-    TimeZone *default_zone = TimeZone::detectHostTimeZone();
-
     // The only way for DEFAULT_ZONE to be non-null at this point is if the user
     // made a thread-unsafe call to setDefault() or adoptDefault() in another
     // thread while this thread was doing something that required getting the default.
index efec54b..0a1441b 100644 (file)
@@ -273,23 +273,6 @@ public:
     static const UnicodeString U_EXPORT2 getEquivalentID(const UnicodeString& id,
                                                int32_t index);
 
-#ifndef U_HIDE_DRAFT_API
-    /**
-     * Creates an instance of TimeZone detected from the current host
-     * system configuration. Note that ICU4C does not change the default
-     * time zone unless TimeZone::adoptDefault(TimeZone*) or
-     * TimeZone::setDefault(const TimeZone&) is explicitly called by a
-     * user. This method does not update the current ICU's default,
-     * and may return a different TimeZone from the one returned by
-     * TimeZone::createDefault().
-     *
-     * @return  A new instance of TimeZone detected from the current host system
-     *          configuration.
-     * @draft ICU 55
-     */
-    static TimeZone* U_EXPORT2 detectHostTimeZone();
-#endif
-
     /**
      * Creates an instance of TimeZone detected from the current host
      * system configuration. Note that ICU4C does not change the default
index 8e2fb4e..a8b44be 100644 (file)
@@ -90,16 +90,13 @@ $(TARGET) : $(OBJECTS)
        $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
        $(POST_BUILD_STEP)
 
-genrb.o: genrb.c
-       gcc $(CPPFLAGS) -c genrb.c $(LIBS)
+%.o: %.cpp
+       $(LINK.cc) $(CPPFLAGS) -c $< $(LIBS)
 
 $(DERB) : $(DERB_OBJ)
        $(LINK.cc) $(OUTOPT)$@ $^ $(LIBICUIO) $(LIBS)
        $(POST_BUILD_STEP)
 
-derb.o: derb.c
-       gcc $(CPPFLAGS) -c derb.c $(LIBS)
-
 # This line is needed to serialize builds when the gmake -j option is used.
 $(TARGET_STUB_NAME).$(SECTION): $(DERB_STUB_NAME).$(SECTION)
 
index aa7a6f6..4f51f0e 100644 (file)
@@ -26,7 +26,7 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -fpermissive -I$(top_srcdir)/common -I$(srcdir)/../toolutil
 LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
@@ -79,8 +79,8 @@ $(TARGET) : $(OBJECTS)
        $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
        $(POST_BUILD_STEP)
 
-makeconv.o: makeconv.c
-       $(LINK.cc) $(CPPFLAGS) -c makeconv.c $(LIBS)
+%.o: %.c
+       $(LINK.cc) $(CPPFLAGS) -c $< $(LIBS)
 
 %.$(SECTION): $(srcdir)/%.$(SECTION).in
        cd $(top_builddir) \