Hello community, here is the log from the commit of package icu for openSUSE:Factory checked in at 2018-05-18 14:26:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icu (Old) and /work/SRC/openSUSE:Factory/.icu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icu" Fri May 18 14:26:10 2018 rev:60 rq:594915 version:61.1 Changes: -------- --- /work/SRC/openSUSE:Factory/icu/icu.changes 2018-01-09 14:48:48.536135215 +0100 +++ /work/SRC/openSUSE:Factory/.icu.new/icu.changes 2018-05-18 14:26:14.734020221 +0200 @@ -1,0 +2,7 @@ +Wed Apr 4 20:22:42 UTC 2018 - [email protected] + +- Update to new upstream release 61.1 + * ICU 61 upgrades to CLDR 33 locale data. +- Add icu-number-grouping.diff + +------------------------------------------------------------------- Old: ---- icu4c-60_2-docs.zip icu4c-60_2-src.tgz New: ---- icu-number-grouping.diff icu4c-61_1-docs.zip icu4c-61_1-src.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icu.spec ++++++ --- /var/tmp/diff_new_pack.g0cQgI/_old 2018-05-18 14:26:43.012982361 +0200 +++ /var/tmp/diff_new_pack.g0cQgI/_new 2018-05-18 14:26:43.012982361 +0200 @@ -1,7 +1,7 @@ # # spec file for package icu # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 libicu60_2 -%define amajor 60 -%define aversion 60_2 +%define lname libicu61_1 +%define amajor 61 +%define aversion 61_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: 60.2 +Version: 61.1 Release: 0 Summary: International Components for Unicode License: ICU @@ -39,6 +39,7 @@ Patch6: icu-error-reporting.diff Patch7: icu-avoid-x87-excess-precision.diff Patch8: xlocale.patch +Patch9: icu-number-grouping.diff BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkg-config @@ -138,7 +139,7 @@ %prep %setup -q -n icu -%patch -P 3 -P 4 -P 6 -P 7 -P 8 -p1 +%patch -P 3 -P 4 -P 6 -P 7 -P 8 -P 9 -p1 # docs are special mkdir html pushd html/ ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.g0cQgI/_old 2018-05-18 14:26:43.040981334 +0200 +++ /var/tmp/diff_new_pack.g0cQgI/_new 2018-05-18 14:26:43.040981334 +0200 @@ -1,4 +1,4 @@ -libicu60_2 +libicu61_1 libicu-devel requires -libicu-<targettype> - requires "libicu60_2-<targettype> = <version>" + requires "libicu61_1-<targettype> = <version>" ++++++ icu-number-grouping.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2018-04-05 01:42:48.090215154 +0200 make the compiler and rpmlint happy [ 59s] number_grouping.cpp: In static member function 'static icu_61_1::number::impl::Grouper icu_61_1::number::impl::Grouper::forStrategy(UGroupingStrategy)': [ 59s] number_grouping.cpp:52:1: warning: control reaches end of non-void function [-Wreturn-type] --- source/i18n/number_grouping.cpp | 1 + 1 file changed, 1 insertion(+) Index: icu/source/i18n/number_grouping.cpp =================================================================== --- icu.orig/source/i18n/number_grouping.cpp +++ icu/source/i18n/number_grouping.cpp @@ -48,6 +48,7 @@ Grouper Grouper::forStrategy(UGroupingSt return {3, 3, 1}; default: U_ASSERT(FALSE); + return {}; } } ++++++ icu-versioning.diff ++++++ --- /var/tmp/diff_new_pack.g0cQgI/_old 2018-05-18 14:26:43.056980746 +0200 +++ /var/tmp/diff_new_pack.g0cQgI/_new 2018-05-18 14:26:43.060980599 +0200 @@ -78,8 +78,8 @@ @@ -59,6 +59,7 @@ * @stable ICU 2.4 */ - #define U_ICU_VERSION_MAJOR_NUM 60 -+#define U_ICU_VERSION_MAJOR_STR "60" + #define U_ICU_VERSION_MAJOR_NUM 61 ++#define U_ICU_VERSION_MAJOR_STR "61" /** The current ICU minor version as an integer. * This value will change in the subsequent releases of ICU @@ -87,19 +87,19 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ --#define U_ICU_VERSION_SUFFIX _60 +-#define U_ICU_VERSION_SUFFIX _61 +#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) /** * \def U_DEF2_ICU_ENTRY_POINT_RENAME -@@ -125,7 +128,7 @@ - * This value will change in the subsequent releases of ICU - * @stable ICU 2.6 +@@ -132,7 +135,7 @@ + * + * @stable ICU 2.6 */ --#define U_ICU_VERSION_SHORT "60" -+#define U_ICU_VERSION_SHORT "60_2" +-#define U_ICU_VERSION_SHORT "61" ++#define U_ICU_VERSION_SHORT "61_1" #ifndef U_HIDE_INTERNAL_API /** Data version in ICU4C. ++++++ icu4c-60_2-src.tgz -> icu4c-61_1-src.tgz ++++++ /work/SRC/openSUSE:Factory/icu/icu4c-60_2-src.tgz /work/SRC/openSUSE:Factory/.icu.new/icu4c-61_1-src.tgz differ: char 5, line 1
