diff --git a/baselibs.conf b/baselibs.conf index f8752a0..ea99e62 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libicu58_1 +libicu58_2 libicu-devel requires -libicu- - requires "libicu58_1- = " + requires "libicu58_2- = " diff --git a/icu-error-reporting.diff b/icu-error-reporting.diff index 0ac2fb6..7b030cd 100644 --- a/icu-error-reporting.diff +++ b/icu-error-reporting.diff @@ -11,7 +11,7 @@ Index: icu/source/tools/toolutil/package.cpp =================================================================== --- icu.orig/source/tools/toolutil/package.cpp +++ icu/source/tools/toolutil/package.cpp -@@ -33,6 +33,7 @@ +@@ -35,6 +35,7 @@ #include "package.h" #include "cmemory.h" @@ -19,7 +19,7 @@ Index: icu/source/tools/toolutil/package.cpp #include #include #include -@@ -751,7 +752,7 @@ Package::writePackage(const char *filena +@@ -748,7 +749,7 @@ Package::writePackage(const char *filena // create the file and write its contents file=fopen(filename, "wb"); if(file==NULL) { @@ -28,7 +28,7 @@ Index: icu/source/tools/toolutil/package.cpp exit(U_FILE_ACCESS_ERROR); } -@@ -1172,7 +1173,7 @@ Package::extractItem(const char *filesPa +@@ -1169,7 +1170,7 @@ Package::extractItem(const char *filesPa makeFullFilenameAndDirs(filesPath, outName, filename, (int32_t)sizeof(filename)); file=fopen(filename, "wb"); if(file==NULL) { @@ -41,7 +41,7 @@ Index: icu/source/tools/toolutil/writesrc.c =================================================================== --- icu.orig/source/tools/toolutil/writesrc.c +++ icu/source/tools/toolutil/writesrc.c -@@ -16,7 +16,9 @@ +@@ -18,7 +18,9 @@ * Helper functions for writing source code for data. */ diff --git a/icu-fix-install-mode-files.diff b/icu-fix-install-mode-files.diff index 57e1dc4..b0a6954 100644 --- a/icu-fix-install-mode-files.diff +++ b/icu-fix-install-mode-files.diff @@ -24,7 +24,7 @@ Index: icu/source/data/Makefile.in =================================================================== --- icu.orig/source/data/Makefile.in +++ icu/source/data/Makefile.in -@@ -196,16 +196,16 @@ endif +@@ -200,16 +200,16 @@ endif install-local: $(PKGDATA_LIST) ./icupkg.inc packagedata $(OS390INSTALL) $(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(ICUPKGDATA_DIR) ifeq ($(PKGDATA_MODE),files) diff --git a/icu-versioning.diff b/icu-versioning.diff index 73aedeb..aa09fa3 100644 --- a/icu-versioning.diff +++ b/icu-versioning.diff @@ -47,7 +47,7 @@ Index: icu/source/common/icuplug.cpp =================================================================== --- icu.orig/source/common/icuplug.cpp +++ icu/source/common/icuplug.cpp -@@ -758,7 +758,7 @@ uplug_init(UErrorCode *status) { +@@ -760,7 +760,7 @@ uplug_init(UErrorCode *status) { pluginFile.append(plugin_dir, *status); pluginFile.append(U_FILE_SEP_STRING, -1, *status); pluginFile.append("icuplugins", -1, *status); @@ -60,7 +60,7 @@ Index: icu/source/common/umapfile.c =================================================================== --- icu.orig/source/common/umapfile.c +++ icu/source/common/umapfile.c -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ # define LIB_PREFIX "lib" # define LIB_SUFFIX ".dll" /* This is inconvienient until we figure out what to do with U_ICUDATA_NAME in utypes.h */ @@ -69,7 +69,7 @@ Index: icu/source/common/umapfile.c # endif #elif MAP_IMPLEMENTATION==MAP_STDIO # include -@@ -414,10 +414,10 @@ +@@ -416,10 +416,10 @@ /* BUT FOR BATCH MODE IT IS AN EXCEPTION BECAUSE */ /* THE FIRST THREE LETTERS ARE PREASSIGNED TO THE */ /* PROJECT!!!!! */ @@ -86,7 +86,7 @@ Index: icu/source/common/unicode/utypes.h =================================================================== --- icu.orig/source/common/unicode/utypes.h +++ icu/source/common/unicode/utypes.h -@@ -134,9 +134,9 @@ +@@ -136,9 +136,9 @@ * ICU 1.8.x on EBCDIC, etc.. * @stable ICU 2.0 */ @@ -102,7 +102,7 @@ Index: icu/source/common/unicode/uvernum.h =================================================================== --- icu.orig/source/common/unicode/uvernum.h +++ icu/source/common/unicode/uvernum.h -@@ -58,6 +58,7 @@ +@@ -59,6 +59,7 @@ * @stable ICU 2.4 */ #define U_ICU_VERSION_MAJOR_NUM 58 @@ -110,7 +110,7 @@ Index: icu/source/common/unicode/uvernum.h /** The current ICU minor version as an integer. * This value will change in the subsequent releases of ICU -@@ -83,7 +84,9 @@ +@@ -84,7 +85,9 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ @@ -121,7 +121,7 @@ Index: icu/source/common/unicode/uvernum.h /** * \def U_DEF2_ICU_ENTRY_POINT_RENAME -@@ -124,7 +127,7 @@ +@@ -125,7 +128,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ @@ -134,7 +134,7 @@ Index: icu/source/config/mh-linux =================================================================== --- icu.orig/source/config/mh-linux +++ icu/source/config/mh-linux -@@ -25,7 +25,7 @@ LDFLAGSICUDT=-nodefaultlibs -nostdlib +@@ -27,7 +27,7 @@ LDFLAGSICUDT=-nodefaultlibs -nostdlib ## Compiler switch to embed a library name # The initial tab in the next line is to prevent icu-config from reading it. @@ -147,7 +147,7 @@ Index: icu/source/config/pkgdataMakefile.in =================================================================== --- icu.orig/source/config/pkgdataMakefile.in +++ icu/source/config/pkgdataMakefile.in -@@ -14,6 +14,7 @@ include $(top_builddir)/icudefs.mk +@@ -16,6 +16,7 @@ include $(top_builddir)/icudefs.mk OUTPUTFILE=pkgdata.inc MIDDLE_SO_TARGET= @@ -159,7 +159,7 @@ Index: icu/source/data/pkgdataMakefile.in =================================================================== --- icu.orig/source/data/pkgdataMakefile.in +++ icu/source/data/pkgdataMakefile.in -@@ -14,6 +14,7 @@ include $(top_builddir)/icudefs.mk +@@ -16,6 +16,7 @@ include $(top_builddir)/icudefs.mk OUTPUTFILE=icupkg.inc MIDDLE_SO_TARGET= @@ -171,7 +171,7 @@ Index: icu/source/extra/uconv/pkgdataMakefile.in =================================================================== --- icu.orig/source/extra/uconv/pkgdataMakefile.in +++ icu/source/extra/uconv/pkgdataMakefile.in -@@ -13,6 +13,7 @@ top_builddir = ../.. +@@ -15,6 +15,7 @@ top_builddir = ../.. include $(top_builddir)/icudefs.mk MIDDLE_SO_TARGET= @@ -183,7 +183,7 @@ Index: icu/source/icudefs.mk.in =================================================================== --- icu.orig/source/icudefs.mk.in +++ icu/source/icudefs.mk.in -@@ -196,6 +196,7 @@ LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH +@@ -198,6 +198,7 @@ LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH # Versioned target for a shared library. FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) @@ -195,7 +195,7 @@ Index: icu/source/test/testdata/pkgdataMakefile.in =================================================================== --- icu.orig/source/test/testdata/pkgdataMakefile.in +++ icu/source/test/testdata/pkgdataMakefile.in -@@ -13,6 +13,7 @@ top_builddir = ../.. +@@ -15,6 +15,7 @@ top_builddir = ../.. include $(top_builddir)/icudefs.mk MIDDLE_SO_TARGET= @@ -207,7 +207,7 @@ Index: icu/source/tools/pkgdata/pkgdata.cpp =================================================================== --- icu.orig/source/tools/pkgdata/pkgdata.cpp +++ icu/source/tools/pkgdata/pkgdata.cpp -@@ -1370,7 +1370,7 @@ static int32_t pkg_generateLibraryFile(c +@@ -1372,7 +1372,7 @@ static int32_t pkg_generateLibraryFile(c length = uprv_strlen(pkgDataFlags[GENLIB]) + uprv_strlen(pkgDataFlags[LDICUDTFLAGS]) + ((uprv_strlen(targetDir) + uprv_strlen(libFileNames[LIB_FILE_VERSION_TMP])) * 2) + uprv_strlen(objectFile) + uprv_strlen(pkgDataFlags[LD_SONAME]) + @@ -216,7 +216,7 @@ Index: icu/source/tools/pkgdata/pkgdata.cpp uprv_strlen(pkgDataFlags[RPATH_FLAGS]) + uprv_strlen(pkgDataFlags[BIR_FLAGS]) + BUFFER_PADDING_SIZE; #if U_PLATFORM == U_PF_CYGWIN length += uprv_strlen(targetDir) + uprv_strlen(libFileNames[LIB_FILE_CYGWIN_VERSION]); -@@ -1417,7 +1417,7 @@ static int32_t pkg_generateLibraryFile(c +@@ -1419,7 +1419,7 @@ static int32_t pkg_generateLibraryFile(c #endif objectFile, pkgDataFlags[LD_SONAME], diff --git a/icu.changes b/icu.changes index 08e0f71..b5440c4 100644 --- a/icu.changes +++ b/icu.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sat Dec 10 15:15:55 UTC 2016 - idonmez@suse.com + +- Update to new upstream release 58.2 + * CLDR 30.0.3: + + Fix incorrect data for number of Cantonese speakers in China. + + Hani_Latn transform was not updated with Unihan 9.0 kMandarin + readings. + * Time zone database version 2016j + * #12815 uspoof_getSkeleton sets backwards-incompatible illegal + argument exception + * #12825 uspoof_check goes into an "infinite loop" when U+30FB + is in an input string + * #12832 GreekUpper::toUpper skips the final character on a + non-terminated UTF-8 string + * #12849 u_strToTitle returns incorrect length if destination + is NULL + ------------------------------------------------------------------- Fri Oct 21 10:05:32 UTC 2016 - jengelh@inai.de diff --git a/icu.spec b/icu.spec index 1822462..8182788 100644 --- a/icu.spec +++ b/icu.spec @@ -16,16 +16,16 @@ # -%define lname libicu58_1 +%define lname libicu58_2 %define amajor 58 -%define aversion 58_1 +%define aversion 58_2 %ifarch %armb hppa mips mips64 ppc ppc64 %sparc s390 s390x m68k %define be_platform 1 %else %define be_platform 0 %endif Name: icu -Version: 58.1 +Version: 58.2 Release: 0 Summary: International Components for Unicode License: MIT diff --git a/icu4c-58_1-docs.zip b/icu4c-58_1-docs.zip deleted file mode 100644 index 151ac0b..0000000 --- a/icu4c-58_1-docs.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1d096fc156eeb49f644c53d3859ef82eec1fc70cd429f0ae83c1454e28cd542 -size 6830850 diff --git a/icu4c-58_1-src.tgz b/icu4c-58_1-src.tgz deleted file mode 100644 index 9662ffe..0000000 --- a/icu4c-58_1-src.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309 -size 23366443 diff --git a/icu4c-58_2-docs.zip b/icu4c-58_2-docs.zip new file mode 100644 index 0000000..4e34080 --- /dev/null +++ b/icu4c-58_2-docs.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc17983debc1f23f1bd1ac1ba053f2df5b07858f5af9bd48eeb3b8044c8d3146 +size 6831659 diff --git a/icu4c-58_2-src.tgz b/icu4c-58_2-src.tgz new file mode 100644 index 0000000..2298059 --- /dev/null +++ b/icu4c-58_2-src.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c +size 23369902