SHA256
1
0
forked from pool/icu

Accepting request 695673 from X11:common:Factory

- Update to new upstream release 64.2
  * Japanese era Reiwa (令和) suport [boo#1112183]

OBS-URL: https://build.opensuse.org/request/show/695673
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icu?expand=0&rev=65
This commit is contained in:
Yuchen Lin 2019-04-22 10:22:28 +00:00 committed by Git OBS Bridge
commit e5c2613d88
12 changed files with 70 additions and 62 deletions

View File

@ -1,4 +1,4 @@
libicu-suse64_1 libicu-suse64_2
libicu-devel libicu-devel
requires -libicu-<targettype> requires -libicu-<targettype>
requires "libicu-suse64_1-<targettype> = <version>" requires "libicu-suse64_2-<targettype> = <version>"

View File

@ -3,10 +3,9 @@ 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 Directions: drop patch if unable to forward-port
ICU sometimes changing their ABI without updating the SO numbers. ICU sometimes changes their ABI without updating the SO numbers. They
They did that before, and they did it again with 51.1->51.2. In part, did that before, and they did it again with 51.1->51.2. In part, this
this is owed to how C++ is compiled on the contemporary is owed to how C++ is compiled on the contemporary implementations.
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.
@ -94,12 +93,12 @@ Index: icu/source/common/unicode/uvernum.h
/** /**
* \def U_DEF2_ICU_ENTRY_POINT_RENAME * \def U_DEF2_ICU_ENTRY_POINT_RENAME
@@ -147,7 +150,7 @@ @@ -152,7 +155,7 @@
* *
* @stable ICU 2.6 * @stable ICU 2.6
*/ */
-#define U_ICU_VERSION_SHORT "64" -#define U_ICU_VERSION_SHORT "64"
+#define U_ICU_VERSION_SHORT "64_1" +#define U_ICU_VERSION_SHORT "64_2"
#ifndef U_HIDE_INTERNAL_API #ifndef U_HIDE_INTERNAL_API
/** Data version in ICU4C. /** Data version in ICU4C.
@ -125,9 +124,9 @@ Index: icu/source/config/pkgdataMakefile.in
OUTPUTFILE=pkgdata.inc OUTPUTFILE=pkgdata.inc
MIDDLE_SO_TARGET= MIDDLE_SO_TARGET=
+FULL_SO_TARGET= +FULL_SO_TARGET=
PKGDATA_TRAILING_SPACE=" "
all : clean all : clean
@echo GENCCODE_ASSEMBLY_TYPE=$(GENCCODE_ASSEMBLY) >> $(OUTPUTFILE)
Index: icu/source/data/pkgdataMakefile.in Index: icu/source/data/pkgdataMakefile.in
=================================================================== ===================================================================
--- icu.orig/source/data/pkgdataMakefile.in --- icu.orig/source/data/pkgdataMakefile.in
@ -137,26 +136,26 @@ Index: icu/source/data/pkgdataMakefile.in
OUTPUTFILE=icupkg.inc OUTPUTFILE=icupkg.inc
MIDDLE_SO_TARGET= MIDDLE_SO_TARGET=
+FULL_SO_TARGET= +FULL_SO_TARGET=
PKGDATA_TRAILING_SPACE=" "
all : clean all : clean
@echo GENCCODE_ASSEMBLY_TYPE=$(GENCCODE_ASSEMBLY) >> $(OUTPUTFILE)
Index: icu/source/extra/uconv/pkgdataMakefile.in Index: icu/source/extra/uconv/pkgdataMakefile.in
=================================================================== ===================================================================
--- icu.orig/source/extra/uconv/pkgdataMakefile.in --- icu.orig/source/extra/uconv/pkgdataMakefile.in
+++ icu/source/extra/uconv/pkgdataMakefile.in +++ icu/source/extra/uconv/pkgdataMakefile.in
@@ -15,6 +15,7 @@ top_builddir = ../.. @@ -16,6 +16,7 @@ include $(top_builddir)/icudefs.mk
include $(top_builddir)/icudefs.mk
MIDDLE_SO_TARGET=
+FULL_SO_TARGET=
OUTPUTFILE=pkgdata.inc OUTPUTFILE=pkgdata.inc
MIDDLE_SO_TARGET=
+FULL_SO_TARGET=
PKGDATA_TRAILING_SPACE=" "
all : clean
Index: icu/source/icudefs.mk.in Index: icu/source/icudefs.mk.in
=================================================================== ===================================================================
--- icu.orig/source/icudefs.mk.in --- icu.orig/source/icudefs.mk.in
+++ icu/source/icudefs.mk.in +++ icu/source/icudefs.mk.in
@@ -199,6 +199,7 @@ LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH @@ -202,6 +202,7 @@ LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH
# Versioned target for a shared library. # Versioned target for a shared library.
FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION)
@ -168,14 +167,14 @@ Index: icu/source/test/testdata/pkgdataMakefile.in
=================================================================== ===================================================================
--- icu.orig/source/test/testdata/pkgdataMakefile.in --- icu.orig/source/test/testdata/pkgdataMakefile.in
+++ icu/source/test/testdata/pkgdataMakefile.in +++ icu/source/test/testdata/pkgdataMakefile.in
@@ -15,6 +15,7 @@ top_builddir = ../.. @@ -16,6 +16,7 @@ include $(top_builddir)/icudefs.mk
include $(top_builddir)/icudefs.mk
MIDDLE_SO_TARGET=
+FULL_SO_TARGET=
OUTPUTFILE=pkgdata.inc OUTPUTFILE=pkgdata.inc
MIDDLE_SO_TARGET=
+FULL_SO_TARGET=
PKGDATA_TRAILING_SPACE=" "
all : clean
Index: icu/source/tools/pkgdata/pkgdata.cpp Index: icu/source/tools/pkgdata/pkgdata.cpp
=================================================================== ===================================================================
--- icu.orig/source/tools/pkgdata/pkgdata.cpp --- icu.orig/source/tools/pkgdata/pkgdata.cpp

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Apr 18 11:53:24 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Update to new upstream release 64.2
* This maintenance update for ICU 64 includes draft Unicode
12.1 update, CLDR 35.1 locale data and support for the new
Japanese era Reiwa (令和). [boo#1112183]
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 1 08:22:59 UTC 2019 - Jan Engelhardt <jengelh@inai.de> Mon Apr 1 08:22:59 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

View File

@ -16,16 +16,17 @@
# #
%define lname libicu-suse64_1 %define lname libicu-suse64_2
%define amajor 64 %define amajor 64
%define aversion 64_1 %define aversion 64_2
%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
# icu-versioning.diff needs update for new Version too
Name: icu Name: icu
Version: 64.1 Version: 64.2
Release: 0 Release: 0
Summary: International Components for Unicode Summary: International Components for Unicode
License: ICU License: ICU

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE/6kSmhgNdlt6W+ocm0MrJ9G6INcFAlybzOsACgkQm0MrJ9G6
INd3gQ/+MCAqTjIHGDH5WLotNJqix4W6TriUuxAk94GLXedT/aATN7SHP7J69WNA
s9yIjsJ8A8/+q/REj8+bQso7A8xAZKHujpQn+CWy1IW/N/WrYbrC2dUiTsOTUkOS
gX9v4byqTe0WoySnVq8UnbeYy2JwY5y2QV/W3vHXmtmL0hbULRvMEO8BtKy2YzAP
UpdCdfrqCjEgwhOFV+ya/o+2HzRkS4NEqjF3MpENiW+3v7SwHdl40I5HSd40WE/n
l5jP6qMfXoIA+YvkcyPdWHgOhNzYnenGfKyQWAB421m6adK6Otdg2bbbGbZLjxoQ
9gtV2dlizjHfvow09BQ7zdIHLnWoOEAVzVxs/pk0iLrJhJH2kiCXIdVoJGbyEgux
bJIjiaHJZnhVME7dlUImZJfMyI+91N4vF/3Efudd1H+OM4l6DVKApLmq99ywyy1o
JlRqoDHBmDpO9WG0q9iyvMFQkxFWydjdKqqjtDJhpns212zn0Hbb0P9C01wczwuO
VxAEg2FvkcBEQcnanZ1uRR3+AMvFcEbhBlZxILgnWwzQ2K/8nH477Jk+Sxx9h4LL
+cSVhgONM8JH48oLOy2IjWPU0BYdpTIYlLmQ+Tv7gndxKX+G/DQI7rGET2hqj0rh
obU0+Z83RmbkWFSaqj6H4YHhbGuOXzjJZPfPcFMxLMDd/LGCxKs=
=b7kK
-----END PGP SIGNATURE-----

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE/6kSmhgNdlt6W+ocm0MrJ9G6INcFAlybzOwACgkQm0MrJ9G6
INdeNhAAuyhwlS14PY2UkuD3VYsBU3ayvRBgPne+hvNcGdXLaRiAUbLkq235UQzn
Rta41gGxfcuUa977Gpcg3/T0BmbUEpdUlIw5l/w8BsuPYLaJuqO/hfs1y0rEdbn2
3muuikKkjgYDucSNLuDCEnJx36jAUQwlNLKDrc31O6f2pgfU7d8NT0QaLFzgzfew
XQ0bqtXWJgfXTJNfU7gkzloqEonaYwPtlDeDlbBF6sK81vjeQBKXcXHw4yuvYsgD
X3aXDU3VhvLyZ7tRvtsOFLYY2k1ZsLrq5WcTTj+4d+JeCM5yLKCspwlCAlG95Yek
cgIBGVRGp1x+n+BU7U2AgaHZI7v4AQURjSfwLnlI3oEWiZqgoGpLjIUTZ7h1lOoU
YCmZAG7I+/+zzrWacgMlng8F/9rfJj2vZAwB+nPFkQQLE4fG0/P/BPUEbpLL07lI
dzYGmTHwREN+ZUYzHqWewKpPhZd3CSssySZKF1oi+OnWGxcI8tXEZNM8OkYPQPeC
U2CC7MNKs7D7KIpyQdUfImLDSsidzu/p36WjI1aT6urQ41TZwpGPwvh7yLPQRv5q
ZSxqJSB2C8gB2OYPQdnSs7H32USqpNkVR9Pg9ZSsNFT4chLmJ9fhRLhEZSsPyJvs
u44K8eV3wWPtbxp6ZOjLozY/29vKPRKHulRt1WuLlGjHVQf1CgQ=
=3c5k
-----END PGP SIGNATURE-----

3
icu4c-64_2-docs.zip Normal file
View File

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

16
icu4c-64_2-docs.zip.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE/6kSmhgNdlt6W+ocm0MrJ9G6INcFAly3hGIACgkQm0MrJ9G6
INe+CA/+IMLOo2n4D023jCYeF2zWwtBnTJxbr2R1SfHDdTZADRpQBSkhBtIz7Vr4
EgHlGqoHonnrMqBpRdWquTpEhUBTz+L2v16Y75THWw7ljAp2C7/ZtcAmsPae1T+v
d9VQtVysPQlHeUr52U9Tkmex/nGXbAprc14cvUfaDL+jsAQ+JJuXhMG0X43/+Jj3
ng8aYDT1NTMkWvIj2s8lKlY/BA9Ib+gjJBxZxrwrv/dQ3auuCcyb7hkPrXs/VyHp
8pldx5krosNhgq3xUVciWostnpK1Rf0CuoZC451xbbsU87TmCMncFa6FvHwMkBAc
kJu/6QkEaNn0Jbb11Y8eo42xrPQV/AlsQ1WFjW7Xco9j1cXmkSGq15Up8Me9QFe5
YFawtRcDTdzoFpNlPpvgF8zaLUMhw6XZMbwNu+EaSVVI1XHliUMvUeaCB91ifa+o
6M8E9A19EZQWIlAkPHwiRl4Gnlfcls65nFF9j2tLbOrCpBq3GKFQc2k1ttoXSgAV
yX2oEUwKi36/YEthcMytYO6jj4AYURndd+0gBc+s1pK0Yk/XRK9ljBSkcOL07U+I
I9MshzFgVmsIhDjQDltG1bDSl9ijw1psinL5h00zgLwKjXiFTxRg6U705PGqhAkx
91YCUqila9gabTzjqSzeNd8um68QjPB9uzeexxdzGfj6gBIuS3I=
=Kv4K
-----END PGP SIGNATURE-----

3
icu4c-64_2-src.tgz Normal file
View File

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

16
icu4c-64_2-src.tgz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE/6kSmhgNdlt6W+ocm0MrJ9G6INcFAly3hGIACgkQm0MrJ9G6
INegxw//VnVrLo9OGmCw6Jjt6k4dUz6ij5bztLVx706rsCtdFytABjuXl9rbY/Wr
77/05FvOCA7p1+Oz3BmbVbDBPxq+1WGwC+sy7vyuptm5faaARDzY/lV6aaJzRZrw
XimOXeCotvi7WOgkVzp598ThsQhcuUSyFyn+AuossZpgbVCagu+YD0ILH3RoVwQH
02z3uiMKExZgLjdx9NDLO3VhVBw5JUotfG3sez8cQgxjht87SezjSB1wYpBOwaDs
iJq0qWtOSS1lK4EsvjhFUT/+WzEhXzU7p23R7ZwUDaiXgNzt/o8Wf7+Y3dqBAMlK
VQBAgNEjxtW4oLCiHHtYcRLqsQEJ4/nkp0+ZQwzK+lVUfzgJW1+CFAzYigDtY1Wj
TrQkDRRsAap0YjyIlid4S0wuVPKwEsRUwjF+GyYumC1igh5SvsAcYrstScL6Yu0o
UDZZ7UXfYr/5fUc0BHNK3+MNN/xy/Fi+fyPGH2vYSrQ6xEyyqEbJ43Fc5qZAV1ml
g8Uu6pYVVM33q1Ss4fm1/K2RM3zS09hy8nSLD/qTm/hoERGSA7lygAryqd4hHJZ0
ZpqUOzaDaM/dApjZh+ktQNgYDKpRR9XeIIq1IZa5eSZj3M3cdiLT68qMVEgdaAUQ
NqsyERbWleqdelDUilJ1T7kdrQHfN9iSjmdtK8C5Th7DF6Gsb3c=
=GYeC
-----END PGP SIGNATURE-----