Jan Engelhardt 2015-10-09 09:42:29 +00:00 committed by Git OBS Bridge
parent 3238aba732
commit ae0b809e5e
9 changed files with 58 additions and 47 deletions

View File

@ -1,4 +1,4 @@
libicu55_1 libicu56_1
libicu-devel libicu-devel
requires -libicu-<targettype> requires -libicu-<targettype>
requires "libicu55_1-<targettype> = <version>" requires "libicu56_1-<targettype> = <version>"

View File

@ -1,20 +0,0 @@
From: <vuntz@novell.com>
Do not put date/time in icu-config (needed for build-compare)
---
source/Makefile.in | 1 -
1 file changed, 1 deletion(-)
Index: icu/source/Makefile.in
===================================================================
--- icu.orig/source/Makefile.in
+++ icu/source/Makefile.in
@@ -286,7 +286,6 @@ $(top_builddir)/config/icu-config: $(top
LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@
LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < @platform_make_fragment@ | grep -v '#M#' | uniq >> $@
cat $(top_srcdir)/config/icu-config-bottom >> $@
- echo "# Rebuilt on "`date` >> $@
chmod u-w $@
config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h

View File

@ -1,11 +1,12 @@
From: Jan Engelhardt <jengelh@inai.de> From: Jan Engelhardt <jengelh@inai.de>
Date: 2013-06-11 03:36:48.480850779 +0200 Date: 2013-06-11 03:36:48.480850779 +0200
References: http://bugzilla.novell.com/824262 References: http://bugzilla.novell.com/824262
Directions: drop patch if unable to forward-port
I've had it with ICU always changing their ABI without updating the ICU sometimes changing their ABI without updating the SO numbers.
SO numbers. They did that before, and they have done it with They did that before, and they did it again with 51.1->51.2. In part,
51.1->51.2 again. !@# this is owed to how C++ is compiled on the contemporary
(Will icu-project ever get their act together?) implementations.
Thus, we will use the full version as the SO identifier in openSUSE. Thus, we will use the full version as the SO identifier in openSUSE.
@ -46,7 +47,7 @@ Index: icu/source/common/icuplug.cpp
=================================================================== ===================================================================
--- icu.orig/source/common/icuplug.cpp --- icu.orig/source/common/icuplug.cpp
+++ icu/source/common/icuplug.cpp +++ icu/source/common/icuplug.cpp
@@ -752,7 +752,7 @@ uplug_init(UErrorCode *status) { @@ -758,7 +758,7 @@ uplug_init(UErrorCode *status) {
pluginFile.append(plugin_dir, *status); pluginFile.append(plugin_dir, *status);
pluginFile.append(U_FILE_SEP_STRING, -1, *status); pluginFile.append(U_FILE_SEP_STRING, -1, *status);
pluginFile.append("icuplugins", -1, *status); pluginFile.append("icuplugins", -1, *status);
@ -94,7 +95,7 @@ Index: icu/source/common/unicode/utypes.h
#ifndef U_HIDE_INTERNAL_API #ifndef U_HIDE_INTERNAL_API
-#define U_USRDATA_NAME "usrdt" U_ICU_VERSION_SHORT U_ICUDATA_TYPE_LETTER /**< @internal */ -#define U_USRDATA_NAME "usrdt" U_ICU_VERSION_SHORT U_ICUDATA_TYPE_LETTER /**< @internal */
+#define U_USRDATA_NAME "usrdt" U_ICU_VERSION_MAJOR_STR U_ICUDATA_TYPE_LETTER /**< @internal */ +#define U_USRDATA_NAME "usrdt" U_ICU_VERSION_MAJOR_STR U_ICUDATA_TYPE_LETTER /**< @internal */
#define U_USE_USRDATA 1 /**< @internal */ #define U_USE_USRDATA 0 /**< @internal */
#endif /* U_HIDE_INTERNAL_API */ #endif /* U_HIDE_INTERNAL_API */
Index: icu/source/common/unicode/uvernum.h Index: icu/source/common/unicode/uvernum.h
@ -104,8 +105,8 @@ Index: icu/source/common/unicode/uvernum.h
@@ -58,6 +58,7 @@ @@ -58,6 +58,7 @@
* @stable ICU 2.4 * @stable ICU 2.4
*/ */
#define U_ICU_VERSION_MAJOR_NUM 55 #define U_ICU_VERSION_MAJOR_NUM 56
+#define U_ICU_VERSION_MAJOR_STR "55" +#define U_ICU_VERSION_MAJOR_STR "56"
/** The current ICU minor version as an integer. /** The current ICU minor version as an integer.
* This value will change in the subsequent releases of ICU * This value will change in the subsequent releases of ICU
@ -113,7 +114,7 @@ Index: icu/source/common/unicode/uvernum.h
* This value will change in the subsequent releases of ICU * This value will change in the subsequent releases of ICU
* @stable ICU 2.6 * @stable ICU 2.6
*/ */
-#define U_ICU_VERSION_SUFFIX _55 -#define U_ICU_VERSION_SUFFIX _56
+#define ___icu_version_expand(major, minor) _ ## major ## _ ## minor +#define ___icu_version_expand(major, minor) _ ## major ## _ ## minor
+#define ___icu_version_glue(major, minor) ___icu_version_expand(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) +#define U_ICU_VERSION_SUFFIX ___icu_version_glue(U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM)
@ -124,8 +125,8 @@ Index: icu/source/common/unicode/uvernum.h
* This value will change in the subsequent releases of ICU * This value will change in the subsequent releases of ICU
* @stable ICU 2.6 * @stable ICU 2.6
*/ */
-#define U_ICU_VERSION_SHORT "55" -#define U_ICU_VERSION_SHORT "56"
+#define U_ICU_VERSION_SHORT "55_1" +#define U_ICU_VERSION_SHORT "56_1"
#ifndef U_HIDE_INTERNAL_API #ifndef U_HIDE_INTERNAL_API
/** Data version in ICU4C. /** Data version in ICU4C.
@ -206,7 +207,7 @@ Index: icu/source/tools/pkgdata/pkgdata.cpp
=================================================================== ===================================================================
--- icu.orig/source/tools/pkgdata/pkgdata.cpp --- icu.orig/source/tools/pkgdata/pkgdata.cpp
+++ icu/source/tools/pkgdata/pkgdata.cpp +++ icu/source/tools/pkgdata/pkgdata.cpp
@@ -1356,7 +1356,7 @@ static int32_t pkg_generateLibraryFile(c @@ -1370,7 +1370,7 @@ static int32_t pkg_generateLibraryFile(c
length = uprv_strlen(pkgDataFlags[GENLIB]) + uprv_strlen(pkgDataFlags[LDICUDTFLAGS]) + length = uprv_strlen(pkgDataFlags[GENLIB]) + uprv_strlen(pkgDataFlags[LDICUDTFLAGS]) +
((uprv_strlen(targetDir) + uprv_strlen(libFileNames[LIB_FILE_VERSION_TMP])) * 2) + ((uprv_strlen(targetDir) + uprv_strlen(libFileNames[LIB_FILE_VERSION_TMP])) * 2) +
uprv_strlen(objectFile) + uprv_strlen(pkgDataFlags[LD_SONAME]) + uprv_strlen(objectFile) + uprv_strlen(pkgDataFlags[LD_SONAME]) +
@ -215,7 +216,7 @@ Index: icu/source/tools/pkgdata/pkgdata.cpp
uprv_strlen(pkgDataFlags[RPATH_FLAGS]) + uprv_strlen(pkgDataFlags[BIR_FLAGS]) + BUFFER_PADDING_SIZE; uprv_strlen(pkgDataFlags[RPATH_FLAGS]) + uprv_strlen(pkgDataFlags[BIR_FLAGS]) + BUFFER_PADDING_SIZE;
#if U_PLATFORM == U_PF_CYGWIN #if U_PLATFORM == U_PF_CYGWIN
length += uprv_strlen(targetDir) + uprv_strlen(libFileNames[LIB_FILE_CYGWIN_VERSION]); length += uprv_strlen(targetDir) + uprv_strlen(libFileNames[LIB_FILE_CYGWIN_VERSION]);
@@ -1403,7 +1403,7 @@ static int32_t pkg_generateLibraryFile(c @@ -1417,7 +1417,7 @@ static int32_t pkg_generateLibraryFile(c
#endif #endif
objectFile, objectFile,
pkgDataFlags[LD_SONAME], pkgDataFlags[LD_SONAME],

View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Fri Oct 9 09:31:58 UTC 2015 - jengelh@inai.de
- Update to new upstream release 56.1
* CLDR 28: For details of the many changes in CLDR, see CLDR 28.
* Unicode data updated to Unicode 8.0: 41 new emoji characters,
5,771 new ideographs for Chinese/Japanese/Korean, 6 new scripts,
improved character properties data, etc.
* ICU data size reduced by about 7.2% (1.8MB) via sharing string
values across resource bundles.
* DateIntervalFormat now handles intervals with seconds, and sets
FieldPosition more consistently.
* DateFormat::createInstanceForSkeleton() caches DateFormat
patterns rather than DateTimePatternGenerator instances, for
better performance (for cache hits) and lower heap memory
consumption.
* StringSearch (based on collation) defaults to matches on
normalization boundaries rather than grapheme cluster boundaries,
which yields more matches on Indic text.
* RuleBasedNumberFormat (spelled-out numbers) now handles
infinity, NaN.
* Most of the old Normalizer/unorm.h had been replaced by
(and reimplemented via) Normalizer2, and is now deprecated.
* COLON has been withdrawn as a date pattern character
corresponding to the date field [UDAT_]TIME_SEPARATOR_FIELD;
there is currently no pattern character corresponding to that
field.
* Support for locale key "cf" to specify currency format style,
and interaction with NumberFormat values for UNumberFormatStyle.
- Drop icu-remove-datetime.diff (merged upstream)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 28 19:02:39 UTC 2015 - tchvatal@suse.com Tue Apr 28 19:02:39 UTC 2015 - tchvatal@suse.com

View File

@ -16,16 +16,16 @@
# #
%define lname libicu55_1 %define lname libicu56_1
%define amajor 55 %define amajor 56
%define aversion 55_1 %define aversion 56_1
%ifarch %armb hppa mips mips64 ppc ppc64 %sparc s390 s390x m68k %ifarch %armb hppa mips mips64 ppc ppc64 %sparc s390 s390x m68k
%define be_platform 1 %define be_platform 1
%else %else
%define be_platform 0 %define be_platform 0
%endif %endif
Name: icu Name: icu
Version: 55.1 Version: 56.1
Release: 0 Release: 0
Summary: International Components for Unicode Summary: International Components for Unicode
License: MIT License: MIT
@ -34,7 +34,6 @@ Url: http://icu-project.org/
Source: http://download.icu-project.org/files/icu4c/%version/icu4c-%aversion-src.tgz 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.zip Source2: http://download.icu-project.org/files/icu4c/%version/icu4c-%aversion-docs.zip
Source100: baselibs.conf Source100: baselibs.conf
Patch2: icu-remove-datetime.patch
Patch3: icu-versioning.diff Patch3: icu-versioning.diff
Patch4: icu-fix-install-mode-files.diff Patch4: icu-fix-install-mode-files.diff
Patch6: icu-error-reporting.diff Patch6: icu-error-reporting.diff
@ -157,7 +156,7 @@ cd html
unzip %SOURCE2 unzip %SOURCE2
cd .. cd ..
%patch -P 2 -P 3 -P 4 -P 6 -p1 %patch -P 3 -P 4 -P 6 -p1
%build %build
cd source cd source

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c70c2283655e1d502baa32e4d087f8ce8f07b6230e6baed3567e74c42e5ffcc
size 7800626

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b
size 25600847

3
icu4c-56_1-docs.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:76a773f59a4833a31d9456b4df82fb363a79890e49d4b531cda0ba439dd47399
size 7823395

3
icu4c-56_1-src.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816
size 25721871