From f3bf2328df2fffe0d2c212358e1b0c612c03e8c436be93d7582dfd7e70832977 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 9 Nov 2021 16:13:54 +0000 Subject: [PATCH 1/2] Accepting request 930488 from home:gmbr3:Active - Update to release 70.1: * Unicode 14 (new characters, scripts, emoji, and API constants) * CLDR 40 (many additions and corrections) * Fixes for measurement unit formatting * Can now be built with up to C++20 compilers - Rebased icu-error-reporting.diff OBS-URL: https://build.opensuse.org/request/show/930488 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=151 --- baselibs.conf | 4 ++-- icu-error-reporting.diff | 2 +- icu.changes | 10 ++++++++++ icu.spec | 19 ++++++++++--------- icu4c-69_1-docs.zip | 3 --- icu4c-69_1-docs.zip.asc | 14 -------------- icu4c-69_1-src.tgz | 3 --- icu4c-69_1-src.tgz.asc | 14 -------------- icu4c-70_1-docs.zip | 3 +++ icu4c-70_1-docs.zip.asc | 14 ++++++++++++++ icu4c-70_1-src.tgz | 3 +++ icu4c-70_1-src.tgz.asc | 14 ++++++++++++++ 12 files changed, 57 insertions(+), 46 deletions(-) delete mode 100644 icu4c-69_1-docs.zip delete mode 100644 icu4c-69_1-docs.zip.asc delete mode 100644 icu4c-69_1-src.tgz delete mode 100644 icu4c-69_1-src.tgz.asc create mode 100644 icu4c-70_1-docs.zip create mode 100644 icu4c-70_1-docs.zip.asc create mode 100644 icu4c-70_1-src.tgz create mode 100644 icu4c-70_1-src.tgz.asc diff --git a/baselibs.conf b/baselibs.conf index de5d664..43d285e 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libicu69 +libicu70 libicu-devel requires -libicu- - requires "libicu69- = " + requires "libicu70- = " diff --git a/icu-error-reporting.diff b/icu-error-reporting.diff index 9cf363b..e422a27 100644 --- a/icu-error-reporting.diff +++ b/icu-error-reporting.diff @@ -52,7 +52,7 @@ Index: icu/source/tools/toolutil/writesrc.cpp #include "unicode/utypes.h" #include "unicode/putil.h" @@ -65,8 +67,8 @@ usrc_createWithHeader(const char *path, - } else { + if (f==NULL) { fprintf( stderr, - "usrc_create(%s, %s): unable to create file\n", diff --git a/icu.changes b/icu.changes index d30fd57..c897136 100644 --- a/icu.changes +++ b/icu.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Nov 9 15:39:14 UTC 2021 - Callum Farmer + +- Update to release 70.1: + * Unicode 14 (new characters, scripts, emoji, and API constants) + * CLDR 40 (many additions and corrections) + * Fixes for measurement unit formatting + * Can now be built with up to C++20 compilers +- Rebased icu-error-reporting.diff + ------------------------------------------------------------------- Wed May 12 08:23:58 UTC 2021 - Andreas Schwab diff --git a/icu.spec b/icu.spec index 996f7df..761caf4 100644 --- a/icu.spec +++ b/icu.spec @@ -16,9 +16,9 @@ # -%define lname libicu69 -%define amajor 69 -%define aversion 69 +%define lname libicu70 +%define amajor 70 +%define aversion 70 %ifarch %armb hppa mips mips64 ppc ppc64 %sparc s390 s390x m68k %define be_platform 1 %else @@ -26,7 +26,7 @@ %endif # icu-versioning.diff needs update for new Version too Name: icu -Version: 69.1 +Version: 70.1 Release: 0 Summary: International Components for Unicode License: ICU @@ -34,10 +34,10 @@ Group: Development/Libraries/C and C++ URL: http://icu-project.org/ #Git-Clone: https://github.com/unicode-org/icu.git -Source: https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-src.tgz -Source2: https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-src.tgz.asc -Source3: https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-docs.zip -Source4: https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-docs.zip.asc +Source: https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-src.tgz +Source2: https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-src.tgz.asc +Source3: https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-docs.zip +Source4: https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-docs.zip.asc Source99: icu.keyring Source100: baselibs.conf Patch4: icu-fix-install-mode-files.diff @@ -47,7 +47,7 @@ Patch8: locale.diff Patch9: nan-undefined-conversion.patch BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: python3-base BuildRequires: unzip Provides: bundled(timezone) = 2021a @@ -226,6 +226,7 @@ ICU_DATA="%buildroot/%_datadir/icu/%version" make check %{?_smp_mflags} VERBOSE= %_bindir/makeconv %_bindir/pkgdata %_bindir/uconv +%_bindir/icuexportdata %_sbindir/* %_mandir/man*/* %dir %_datadir/icu diff --git a/icu4c-69_1-docs.zip b/icu4c-69_1-docs.zip deleted file mode 100644 index ab87c38..0000000 --- a/icu4c-69_1-docs.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:670b05fc386b8b855ecd577b8fb15dfffc58a84f01b863321daf81d05b4526ca -size 8109717 diff --git a/icu4c-69_1-docs.zip.asc b/icu4c-69_1-docs.zip.asc deleted file mode 100644 index 854ae7b..0000000 --- a/icu4c-69_1-docs.zip.asc +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQGzBAABCgAdFiEEDlHn8G73GfvQcngqX1blr6Y8zTMFAmBudtkACgkQX1blr6Y8 -zTPfQAv9EG/fgjzHvsIlpMpHSP+ECRl78Uwzi3H3/eFqcYXMZcCF/z86InSDkoIv -JIkbzGSxPeiwv5MW+nZya9zVFCNU9pqOs11blcns1a/lp2jfWvx0aDmQr8LEB0UU -MeFZLjTFuG1fl4aZCzR3TYA+IO3GtvJ4gE1EO25ieGxXj7mkzGV1cpz70yOJ/EKX -3Tfru8bgdwn4kCl7edLcWKN6cs1kXL5M9KHYqlEJ6m0/7HUOa8JmikR60RAhchlM -9RvjgXRXV4YjymzXMjWxCefC1eMuKFsu8DjnjrNENGSBR9WWIMIW34upqQLi+ghI -Zs2nq0x09xyia/oe355R+Y4x3I2OjVm/vPtLnIob2itQ2IdsnJZCV6fCU2sgEukW -Imocgl4HIgBCusDMPGwxV3wNstdNfNfpVIL/bcKtkt3IbC7nQiLwNtS6xq2Rr9T8 -eOT5yeP9wgeKFnUcCJVUbAN8hByyMWU1oSYIBB9FwrwVTo9CmbdlMzcFVBasKAeC -LzTSCzuk -=s09n ------END PGP SIGNATURE----- diff --git a/icu4c-69_1-src.tgz b/icu4c-69_1-src.tgz deleted file mode 100644 index d1716ea..0000000 --- a/icu4c-69_1-src.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745 -size 24814903 diff --git a/icu4c-69_1-src.tgz.asc b/icu4c-69_1-src.tgz.asc deleted file mode 100644 index bf86cf8..0000000 --- a/icu4c-69_1-src.tgz.asc +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQGzBAABCgAdFiEEDlHn8G73GfvQcngqX1blr6Y8zTMFAmBudukACgkQX1blr6Y8 -zTP0QAv+J16FGZmavZI3DLsn2B9g2RqA6q/uAO4/rVwg5YyGcPIa3NB1h304c3vu -Arwv4fuug+weYG/ZgOlIhaTKg+pqEuj2RvazZOdiFZi+Cv6FoIAxBDA0shpXFxcx -nbF88xLN2QCiln6425OQawyFR+a5vOnJQRFScA6Oa4aWhlR4ezNcbnsyuz667bMF -5O14iPhmY5EFvbqrJ7YnVyF7aFGHuK0OZJfRa/6P6IipN+eZEiIquXdLbf8BxQ8/ -wMFG90UiPwPEr4R0lBfkfm3qkMX0b87ic4EUvRG/oHPXIl1mMFSTDaNhoDGYh3x5 -1vHdmjBLzC0ZGIvD+5TV2LwJG1ozqouAaCHGMKvz4xdmKmtiOAtWmrL9/od+BkRl -EORwN2XGpBPlCCNjB0nNJiCat9KHeBcypy3PpLJqU8md76CnLrDj55sZbUC+SPOB -JrNYldo+8/0qHjrQydHC8INH2Z/W5H+9RfMl48Nx4mSNUnLLIkrRWRqlda6LpvwJ -+FJTx0fx -=IpSz ------END PGP SIGNATURE----- diff --git a/icu4c-70_1-docs.zip b/icu4c-70_1-docs.zip new file mode 100644 index 0000000..def7651 --- /dev/null +++ b/icu4c-70_1-docs.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f37ce9ee5894df9356f02c0e55cd9e53464d7fc6c1ba2bb6885eb959f79bf13 +size 8123512 diff --git a/icu4c-70_1-docs.zip.asc b/icu4c-70_1-docs.zip.asc new file mode 100644 index 0000000..e7d6a9e --- /dev/null +++ b/icu4c-70_1-docs.zip.asc @@ -0,0 +1,14 @@ +-----BEGIN PGP SIGNATURE----- + +iQGzBAABCgAdFiEEDlHn8G73GfvQcngqX1blr6Y8zTMFAmF607UACgkQX1blr6Y8 +zTPfDgwAn0lt1o1kWsruOujjtPH2+6OcPjMylFub7MQOtyUf0Cncf7ANLU5znBTL +FlHWo/aBFPZ97D8d4W0Zr7e5eGE/30FqPvs+2vGT9MXQwk9OqpI1F/R3faorLTge +vXAekY6Fw2TlM5RT4eneFCsfLkQ0ra0m9V5nN+mYHduAYM2gaxbbDj0/7DKX2S9H +CxU3iINf4Y7AlSyQO5qwU0bHFyCNtnVT3u/YCSP8omdaz0ojrKeRF+iJAv7oR4Fd +zLgrYu+BO6Y7TtDSXTeqJHGMu8l4vx1iu8HZ4Uvs+p7065f1ADZcgmsVO0O7qNKk +pBDB6f1e5Z6giVaQsYCotgVMTjU7uOR2CngNowBuPIhY+DsDoIdaAlaZ2JhrCrbG +0Tcb5gLohvN4+2ZL/fJgguCkNBX8Zx7ky1B9tcgGTk1M0HmK5CqipKsokisL9pe2 +KBFljA0o5JMql+0PNX6iShVlL/WvUqhYCBiiVg5ECpTHzSe67nBJpFLHrWbD5ymk +81OGVJud +=CA6x +-----END PGP SIGNATURE----- diff --git a/icu4c-70_1-src.tgz b/icu4c-70_1-src.tgz new file mode 100644 index 0000000..d550234 --- /dev/null +++ b/icu4c-70_1-src.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5 +size 25449582 diff --git a/icu4c-70_1-src.tgz.asc b/icu4c-70_1-src.tgz.asc new file mode 100644 index 0000000..8aa2d3a --- /dev/null +++ b/icu4c-70_1-src.tgz.asc @@ -0,0 +1,14 @@ +-----BEGIN PGP SIGNATURE----- + +iQGzBAABCgAdFiEEDlHn8G73GfvQcngqX1blr6Y8zTMFAmF607oACgkQX1blr6Y8 +zTP9MgwAnS7+giI2jWjegkfxO1eeiux0x6Jm9FDhgDjopegUnkrXNy/nP63FIgF+ +9VmaOhif65t+GcTd23uq2fg/ZcUsBG4IN1sWYs6vBKoc+VXUZ3+Ir0/Ks9nxfZ2i +To+OhZ6zZGghArTTOqa+6HT3b+13xt2FOCC+Abw4OXZe6CpYuRhpqu4tGQ78ueaB +icQUTCRwc13L/XuKTfayqek23Xu8KaBC5WwMQNpCQY8dz8uOIFTJ1VNLarmXCs8h +a2iDCbHD9AlZGzRxEUHM8J2naN1CTj2/hP7k8TAFhsHCn40HfqgYUtFHmeQsGSX0 +wb6l0/ixwpsVbARiuo9F/K4ZeuvfMtr2OZncYLdU5Q1HXIg66gM+5/qFn62kH0ie +VuWsOERRty4kPm7kxBnldit8mc49O2USoGKtUfcwP+GIjxiPHWU2MDltEqijTeeb +C2/eNWFNKFDDAHD3Ys481NSNR8XuD8d9gui8WY7iSWJOHU4B0OzvSzVOcN6FW4vv +Q/k3fB9j +=3cD+ +-----END PGP SIGNATURE----- From 4728bc189b542528d21d92b6103e13377fb3dafed106dfcfec5dd8a8430444fa Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 9 Nov 2021 17:30:45 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=152 --- icu.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icu.spec b/icu.spec index 761caf4..268a29c 100644 --- a/icu.spec +++ b/icu.spec @@ -47,10 +47,10 @@ Patch8: locale.diff Patch9: nan-undefined-conversion.patch BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: pkgconfig +BuildRequires: pkg-config BuildRequires: python3-base BuildRequires: unzip -Provides: bundled(timezone) = 2021a +Provides: bundled(timezone) = 2021b %description ICU is a set of C and C++ libraries that provide extensive Unicode and locale