From cfcfa4172462729df3dd89983d603a6f35ebd104493deafef00b3bdbb0fa11f3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 25 Mar 2016 17:26:36 +0000 Subject: [PATCH] - Update to new upstream release 57.1 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=68 --- baselibs.conf | 4 ++-- icu-versioning.diff | 10 +++++----- icu.changes | 15 +++++++++++++++ icu.spec | 16 +++++++++------- icu4c-56_1-docs.zip | 3 --- icu4c-56_1-src.tgz | 3 --- icu4c-57_1-docs.zip | 3 +++ icu4c-57_1-src.tgz | 3 +++ 8 files changed, 37 insertions(+), 20 deletions(-) delete mode 100644 icu4c-56_1-docs.zip delete mode 100644 icu4c-56_1-src.tgz create mode 100644 icu4c-57_1-docs.zip create mode 100644 icu4c-57_1-src.tgz diff --git a/baselibs.conf b/baselibs.conf index 6e57ea0..0345cbb 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libicu56_1 +libicu57_1 libicu-devel requires -libicu- - requires "libicu56_1- = " + requires "libicu57_1- = " diff --git a/icu-versioning.diff b/icu-versioning.diff index 2307268..723e782 100644 --- a/icu-versioning.diff +++ b/icu-versioning.diff @@ -105,8 +105,8 @@ Index: icu/source/common/unicode/uvernum.h @@ -58,6 +58,7 @@ * @stable ICU 2.4 */ - #define U_ICU_VERSION_MAJOR_NUM 56 -+#define U_ICU_VERSION_MAJOR_STR "56" + #define U_ICU_VERSION_MAJOR_NUM 57 ++#define U_ICU_VERSION_MAJOR_STR "57" /** The current ICU minor version as an integer. * This value will change in the subsequent releases of ICU @@ -114,7 +114,7 @@ Index: icu/source/common/unicode/uvernum.h * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ --#define U_ICU_VERSION_SUFFIX _56 +-#define U_ICU_VERSION_SUFFIX _57 +#define ___icu_version_expand(major, minor) _ ## major ## _ ## minor +#define ___icu_version_glue(major, minor) ___icu_version_expand(major, minor) +#define U_ICU_VERSION_SUFFIX ___icu_version_glue(U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM) @@ -125,8 +125,8 @@ Index: icu/source/common/unicode/uvernum.h * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ --#define U_ICU_VERSION_SHORT "56" -+#define U_ICU_VERSION_SHORT "56_1" +-#define U_ICU_VERSION_SHORT "57" ++#define U_ICU_VERSION_SHORT "57_1" #ifndef U_HIDE_INTERNAL_API /** Data version in ICU4C. diff --git a/icu.changes b/icu.changes index 7b946d1..d91bc30 100644 --- a/icu.changes +++ b/icu.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Mar 25 12:32:58 UTC 2016 - jengelh@inai.de + +- Update to new upstream release 57.1 +* CLDR 29 support +* Grapheme/word/line breaking for emoji sequences, based on + Unicode 9 proposed rules. +* Four new Unicode emoji properties +* DateFormat day period formatting of "noon", "at night", etc. via + new pattern characters b & B, and DateTimePatternGenerator + support of C for selecting the customary form. +* RelativeDateTimeFormatter: Simpler formatting API. +* New simple & fast SimpleFormatter class for a trivial subset of + MessageFormat as used in CLDR data. + ------------------------------------------------------------------- Fri Oct 9 09:31:58 UTC 2015 - jengelh@inai.de diff --git a/icu.spec b/icu.spec index 8390ced..fe7d405 100644 --- a/icu.spec +++ b/icu.spec @@ -1,7 +1,7 @@ # # spec file for package icu # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,16 +16,16 @@ # -%define lname libicu56_1 -%define amajor 56 -%define aversion 56_1 +%define lname libicu57_1 +%define amajor 57 +%define aversion 57_1 %ifarch %armb hppa mips mips64 ppc ppc64 %sparc s390 s390x m68k %define be_platform 1 %else %define be_platform 0 %endif Name: icu -Version: 56.1 +Version: 57.1 Release: 0 Summary: International Components for Unicode License: MIT @@ -187,7 +187,7 @@ cp -a license.html readme.html "%buildroot/%_docdir/%name/" find . -name CVS -type d -exec rm -Rf "{}" "+" cd source -make DESTDIR=%buildroot install %{?_smp_mflags} +make DESTDIR="%buildroot" install %{?_smp_mflags} cp data/out/icudt*.dat "%buildroot/%_datadir/icu/%version/" # @@ -218,7 +218,6 @@ mkdir -p "%buildroot/%_datadir/icu/%version/unidata" install -m 644 data/unidata/*.txt "%buildroot/%_datadir/icu/%version/unidata" ln -s unidata/UnicodeData.txt "%buildroot/%_datadir/icu/%version/" -rm "%buildroot/%_datadir/icu/%version/license.html" rm "%buildroot/%_datadir/icu/%version/install-sh" %fdupes %buildroot/%_prefix @@ -271,6 +270,9 @@ fi; %_bindir/uconv %_sbindir/* %_mandir/man*/* +%dir %_datadir/icu +%dir %_datadir/icu/%version +%_datadir/icu/%version/LICENSE %dir %_docdir/%name/ %_docdir/%name/license.html %_docdir/%name/readme.html diff --git a/icu4c-56_1-docs.zip b/icu4c-56_1-docs.zip deleted file mode 100644 index dd7b06a..0000000 --- a/icu4c-56_1-docs.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76a773f59a4833a31d9456b4df82fb363a79890e49d4b531cda0ba439dd47399 -size 7823395 diff --git a/icu4c-56_1-src.tgz b/icu4c-56_1-src.tgz deleted file mode 100644 index d9c8866..0000000 --- a/icu4c-56_1-src.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816 -size 25721871 diff --git a/icu4c-57_1-docs.zip b/icu4c-57_1-docs.zip new file mode 100644 index 0000000..f86aa02 --- /dev/null +++ b/icu4c-57_1-docs.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01b5773e9d76de65daec348b1afd653d53ae0ecbbdc67856c4d007fc7b906436 +size 7880926 diff --git a/icu4c-57_1-src.tgz b/icu4c-57_1-src.tgz new file mode 100644 index 0000000..6f952f8 --- /dev/null +++ b/icu4c-57_1-src.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581 +size 22360664