Hello community, here is the log from the commit of package icu for openSUSE:Factory checked in at 2015-05-07 09:20:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-11-13 09:19:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.icu.new/icu.changes 2015-05-07 09:20:47.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Apr 28 19:02:39 UTC 2015 - tchvatal@suse.com + +- Update baselibs.conf + +------------------------------------------------------------------- +Tue Apr 28 10:56:53 UTC 2015 - tchvatal@suse.com + +- Version bump to latest release 55.1: + * support of CLDR 27 (with a major cleanup of region locales, among many + other improvements), formatting for scientific notation ("1.2 × 10³") + * update to Unicode 7.0 data for spoof-checking + * Various performance enhancements + * Full upstream changelog: + http://site.icu-project.org/download/55 +- Refresh the soname versioning patch: + * icu-versioning.diff + +------------------------------------------------------------------- Old: ---- icu4c-54_1-docs.zip icu4c-54_1-src.tgz sanitize_docs.sh New: ---- icu4c-55_1-docs.zip icu4c-55_1-src.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icu.spec ++++++ --- /var/tmp/diff_new_pack.zNFDOg/_old 2015-05-07 09:20:50.000000000 +0200 +++ /var/tmp/diff_new_pack.zNFDOg/_new 2015-05-07 09:20:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package icu # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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,20 +16,23 @@ # -%define lname libicu54_1 -%define amajor 54 -%define aversion 54_1 +%define lname libicu55_1 +%define amajor 55 +%define aversion 55_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: 54.1 +Version: 55.1 Release: 0 Summary: International Components for Unicode License: MIT Group: Development/Libraries/C and C++ Url: http://icu-project.org/ - Source: http://download.icu-project.org/files/icu4c/%version/icu4c-%aversion-src.tgz Source2: http://download.icu-project.org/files/icu4c/%version/icu4c-%aversion-docs.zi... -Source3: sanitize_docs.sh Source100: baselibs.conf Patch2: icu-remove-datetime.patch Patch3: icu-versioning.diff @@ -40,11 +43,6 @@ BuildRequires: pkg-config BuildRequires: unzip BuildRoot: %{_tmppath}/%{name}-%{version}-build -%ifarch %armb hppa mips mips64 ppc ppc64 %sparc s390 s390x m68k -%define be_platform 1 -%else -%define be_platform 0 -%endif %description ICU is a set of C and C++ libraries that provides robust and @@ -60,15 +58,15 @@ %package -n %lname Summary: International Components for Unicode Group: System/Libraries -%if %be_platform -Requires: libicu%{aversion}-bedata -%else -Requires: libicu%{aversion}-ledata -%endif Requires: timezone # Following O/P added in timeframe for 12.2 Provides: libicu = %version Obsoletes: libicu < %version +%if %be_platform +Requires: libicu%aversion-bedata = %version +%else +Requires: libicu%aversion-ledata = %version +%endif %description -n %lname ICU is a set of C and C++ libraries that provides robust and @@ -83,8 +81,8 @@ %endif %if %be_platform # Added for 13.2 -Obsoletes: libicu%aversion-data -Provides: libicu%aversion-data +Obsoletes: libicu%aversion-data < %version +Provides: libicu%aversion-data = %version %endif %description -n libicu%aversion-bedata @@ -105,8 +103,8 @@ %endif %if !%be_platform # Added for 13.2 -Obsoletes: libicu%aversion-data -Provides: libicu%aversion-data +Obsoletes: libicu%aversion-data < %version +Provides: libicu%aversion-data = %version %endif %description -n libicu%aversion-ledata @@ -190,7 +188,7 @@ find . -name CVS -type d -exec rm -Rf "{}" "+" cd source -make install DESTDIR="%buildroot" +make DESTDIR=%buildroot install %{?_smp_mflags} cp data/out/icudt*.dat "%buildroot/%_datadir/icu/%version/" # @@ -282,13 +280,13 @@ %defattr(-, root, root) %_libdir/libicu*.so.* -%files -n libicu%{aversion}-bedata +%files -n libicu%aversion-bedata %defattr(-,root,root) %dir %_datadir/icu %dir %_datadir/icu/%version %_datadir/icu/%version/icudt%{amajor}b.dat -%files -n libicu%{aversion}-ledata +%files -n libicu%aversion-ledata %defattr(-,root,root) %dir %_datadir/icu %dir %_datadir/icu/%version ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.zNFDOg/_old 2015-05-07 09:20:50.000000000 +0200 +++ /var/tmp/diff_new_pack.zNFDOg/_new 2015-05-07 09:20:50.000000000 +0200 @@ -1,4 +1,4 @@ -libicu54_1 +libicu55_1 libicu-devel requires -libicu-<targettype> - requires "libicu54_1-<targettype> = <version>" + requires "libicu55_1-<targettype> = <version>" ++++++ icu-versioning.diff ++++++ --- /var/tmp/diff_new_pack.zNFDOg/_old 2015-05-07 09:20:50.000000000 +0200 +++ /var/tmp/diff_new_pack.zNFDOg/_new 2015-05-07 09:20:50.000000000 +0200 @@ -46,7 +46,7 @@ =================================================================== --- icu.orig/source/common/icuplug.cpp +++ icu/source/common/icuplug.cpp -@@ -751,7 +751,7 @@ uplug_init(UErrorCode *status) { +@@ -752,7 +752,7 @@ uplug_init(UErrorCode *status) { pluginFile.append(plugin_dir, *status); pluginFile.append(U_FILE_SEP_STRING, -1, *status); pluginFile.append("icuplugins", -1, *status); @@ -104,8 +104,8 @@ @@ -58,6 +58,7 @@ * @stable ICU 2.4 */ - #define U_ICU_VERSION_MAJOR_NUM 54 -+#define U_ICU_VERSION_MAJOR_STR "54" + #define U_ICU_VERSION_MAJOR_NUM 55 ++#define U_ICU_VERSION_MAJOR_STR "55" /** 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 _54 +-#define U_ICU_VERSION_SUFFIX _55 +#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 "54" -+#define U_ICU_VERSION_SHORT "54_1" +-#define U_ICU_VERSION_SHORT "55" ++#define U_ICU_VERSION_SHORT "55_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 -@@ -1346,7 +1346,7 @@ static int32_t pkg_generateLibraryFile(c +@@ -1356,7 +1356,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]); -@@ -1393,7 +1393,7 @@ static int32_t pkg_generateLibraryFile(c +@@ -1403,7 +1403,7 @@ static int32_t pkg_generateLibraryFile(c #endif objectFile, pkgDataFlags[LD_SONAME], ++++++ icu4c-54_1-src.tgz -> icu4c-55_1-src.tgz ++++++ /work/SRC/openSUSE:Factory/icu/icu4c-54_1-src.tgz /work/SRC/openSUSE:Factory/.icu.new/icu4c-55_1-src.tgz differ: char 5, line 1