Hello community, here is the log from the commit of package icu for openSUSE:Factory checked in at 2014-11-13 09:19:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icu (Old) and /work/SRC/openSUSE:Factory/.icu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icu" Changes: -------- --- /work/SRC/openSUSE:Factory/icu/icu.changes 2014-09-10 07:28:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.icu.new/icu.changes 2014-11-13 09:19:26.000000000 +0100 @@ -1,0 +2,16 @@ +Sat Oct 11 15:55:39 UTC 2014 - [email protected] + +- Update to new upstream release 54.1 +* Unicode 7.0: Unicode 7.0 adds a total of 2,834 characters, + encompassing 23 new scripts, two currency symbols (manat & + ruble), many new pictographic and geometric symbols, and + character additions to many existing scripts. +* CLDR 26: 77 languages with 100% modern coverage, more & improved + data, many more measurement units. +- Remove icu-rpmlint.diff (solved differently upstream), + icu-fix-tests-depending-on-date.patch (solved differently + upstream, also take note of + http://bugs.icu-project.org/trac/ticket/10937 it may need to be + reinstated) + +------------------------------------------------------------------- Old: ---- icu-fix-tests-depending-on-date.patch icu-rpmlint.diff icu4c-53_1-docs.zip icu4c-53_1-src.tgz New: ---- icu4c-54_1-docs.zip icu4c-54_1-src.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icu.spec ++++++ --- /var/tmp/diff_new_pack.pQDmxy/_old 2014-11-13 09:19:31.000000000 +0100 +++ /var/tmp/diff_new_pack.pQDmxy/_new 2014-11-13 09:19:31.000000000 +0100 @@ -16,11 +16,11 @@ # -%define lname libicu53_1 -%define amajor 53 -%define aversion 53_1 +%define lname libicu54_1 +%define amajor 54 +%define aversion 54_1 Name: icu -Version: 53.1 +Version: 54.1 Release: 0 Summary: International Components for Unicode License: MIT @@ -31,11 +31,9 @@ Source2: http://download.icu-project.org/files/icu4c/%version/icu4c-%aversion-docs.zip Source3: sanitize_docs.sh Source100: baselibs.conf -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 Patch6: icu-error-reporting.diff BuildRequires: fdupes BuildRequires: gcc-c++ @@ -161,7 +159,7 @@ unzip %SOURCE2 cd .. -%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1 +%patch -P 2 -P 3 -P 4 -P 6 -p1 %build cd source @@ -179,7 +177,8 @@ cp in/icudt%{amajor}l.dat out/ %else LD_LIBRARY_PATH="../lib:../stubdata:../tools/ctestfw:$LD_LIBRARY_PATH" \ - ../bin/icupkg -tb ./in/icudt%{amajor}l.dat ./out/icudt%{amajor}b.dat + ../bin/icupkg -tb in/icudt%{amajor}l.dat out/icudt%{amajor}b.dat +! cmp in/icudt%{amajor}l.dat out/icudt%{amajor}b.dat %endif popd ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.pQDmxy/_old 2014-11-13 09:19:31.000000000 +0100 +++ /var/tmp/diff_new_pack.pQDmxy/_new 2014-11-13 09:19:31.000000000 +0100 @@ -1,4 +1,4 @@ -libicu53_1 +libicu54_1 libicu-devel requires -libicu-<targettype> - requires "libicu53_1-<targettype> = <version>" + requires "libicu54_1-<targettype> = <version>" ++++++ icu-fix-install-mode-files.diff ++++++ --- /var/tmp/diff_new_pack.pQDmxy/_old 2014-11-13 09:19:31.000000000 +0100 +++ /var/tmp/diff_new_pack.pQDmxy/_new 2014-11-13 09:19:31.000000000 +0100 @@ -17,14 +17,14 @@ mkdir: cannot create directory '/usr/share/icu': Permission denied --- - source/data/Makefile.in | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) + source/data/Makefile.in | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) Index: icu/source/data/Makefile.in =================================================================== --- icu.orig/source/data/Makefile.in +++ icu/source/data/Makefile.in -@@ -191,15 +191,15 @@ endif +@@ -196,16 +196,16 @@ endif install-local: $(PKGDATA_LIST) ./icupkg.inc packagedata $(OS390INSTALL) $(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(ICUPKGDATA_DIR) ifeq ($(PKGDATA_MODE),files) @@ -33,6 +33,7 @@ - $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(LANG_TREE) - $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(REGION_TREE) - $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(ZONE_TREE) +- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(UNIT_TREE) - $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(BREAK_TREE) - $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(COLLATION_TREE) - $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(RBNF_TREE) @@ -42,6 +43,7 @@ + $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(LANG_TREE) + $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(REGION_TREE) + $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(ZONE_TREE) ++ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(UNIT_TREE) + $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(BREAK_TREE) + $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(COLLATION_TREE) + $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(RBNF_TREE) ++++++ icu-versioning.diff ++++++ --- /var/tmp/diff_new_pack.pQDmxy/_old 2014-11-13 09:19:31.000000000 +0100 +++ /var/tmp/diff_new_pack.pQDmxy/_new 2014-11-13 09:19:31.000000000 +0100 @@ -29,7 +29,7 @@ development seems to not pay enough attention. --- - source/common/icuplug.c | 2 +- + source/common/icuplug.cpp | 2 +- source/common/umapfile.c | 6 +++--- source/common/unicode/utypes.h | 4 ++-- source/common/unicode/uvernum.h | 7 +++++-- @@ -42,19 +42,19 @@ source/tools/pkgdata/pkgdata.cpp | 4 ++-- 11 files changed, 19 insertions(+), 11 deletions(-) -Index: icu/source/common/icuplug.c +Index: icu/source/common/icuplug.cpp =================================================================== ---- icu.orig/source/common/icuplug.c -+++ icu/source/common/icuplug.c -@@ -744,7 +744,7 @@ uplug_init(UErrorCode *status) { - uprv_strncpy(plugin_file, plugin_dir, 2047); - uprv_strncat(plugin_file, U_FILE_SEP_STRING,2047); - uprv_strncat(plugin_file, "icuplugins",2047); -- uprv_strncat(plugin_file, U_ICU_VERSION_SHORT ,2047); -+ uprv_strncat(plugin_file, U_ICU_VERSION_MAJOR_STR, 2047); - uprv_strncat(plugin_file, ".txt" ,2047); +--- icu.orig/source/common/icuplug.cpp ++++ icu/source/common/icuplug.cpp +@@ -751,7 +751,7 @@ uplug_init(UErrorCode *status) { + pluginFile.append(plugin_dir, *status); + pluginFile.append(U_FILE_SEP_STRING, -1, *status); + pluginFile.append("icuplugins", -1, *status); +- pluginFile.append(U_ICU_VERSION_SHORT, -1, *status); ++ pluginFile.append(U_ICU_VERSION_MAJOR_STR, -1, *status); + pluginFile.append(".txt", -1, *status); #endif - + Index: icu/source/common/umapfile.c =================================================================== --- icu.orig/source/common/umapfile.c @@ -104,8 +104,8 @@ @@ -58,6 +58,7 @@ * @stable ICU 2.4 */ - #define U_ICU_VERSION_MAJOR_NUM 53 -+#define U_ICU_VERSION_MAJOR_STR "53" + #define U_ICU_VERSION_MAJOR_NUM 54 ++#define U_ICU_VERSION_MAJOR_STR "54" /** The current ICU minor version as an integer. * This value will change in the subsequent releases of ICU @@ -113,7 +113,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ --#define U_ICU_VERSION_SUFFIX _53 +-#define U_ICU_VERSION_SUFFIX _54 +#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) @@ -124,8 +124,8 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ --#define U_ICU_VERSION_SHORT "53" -+#define U_ICU_VERSION_SHORT "53_1" +-#define U_ICU_VERSION_SHORT "54" ++#define U_ICU_VERSION_SHORT "54_1" #ifndef U_HIDE_INTERNAL_API /** Data version in ICU4C. @@ -206,7 +206,7 @@ =================================================================== --- icu.orig/source/tools/pkgdata/pkgdata.cpp +++ icu/source/tools/pkgdata/pkgdata.cpp -@@ -1273,7 +1273,7 @@ static int32_t pkg_generateLibraryFile(c +@@ -1346,7 +1346,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]) + @@ -215,7 +215,7 @@ 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]); -@@ -1320,7 +1320,7 @@ static int32_t pkg_generateLibraryFile(c +@@ -1393,7 +1393,7 @@ static int32_t pkg_generateLibraryFile(c #endif objectFile, pkgDataFlags[LD_SONAME], ++++++ icu4c-53_1-src.tgz -> icu4c-54_1-src.tgz ++++++ /work/SRC/openSUSE:Factory/icu/icu4c-53_1-src.tgz /work/SRC/openSUSE:Factory/.icu.new/icu4c-54_1-src.tgz differ: char 4, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
