From be6c5ced855ce62b9fd3bcd9233a17949679f0f6f79cc9a3bb5aadaee6b46298 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 19 Oct 2022 11:29:52 +0000 Subject: [PATCH] - Update to release 72.1 - Remove keyring; the signing key switched again and it's nowhere to be found. Especially not in https://github.com/unicode-org/icu/blob/main/KEYS OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=160 --- baselibs.conf | 5 +-- icu-avoid-x87-excess-precision.diff | 8 ++-- icu-error-reporting.diff | 4 +- icu.changes | 11 ++++++ icu.keyring | 61 ----------------------------- icu.spec | 22 +++++------ icu4c-71_1-docs.zip | 3 -- icu4c-71_1-docs.zip.asc | 14 ------- icu4c-71_1-src.tgz | 3 -- icu4c-71_1-src.tgz.asc | 14 ------- icu4c-72_1-docs.zip | 3 ++ icu4c-72_1-docs.zip.asc | 14 +++++++ icu4c-72_1-src.tgz | 3 ++ icu4c-72_1-src.tgz.asc | 14 +++++++ 14 files changed, 62 insertions(+), 117 deletions(-) delete mode 100644 icu.keyring delete mode 100644 icu4c-71_1-docs.zip delete mode 100644 icu4c-71_1-docs.zip.asc delete mode 100644 icu4c-71_1-src.tgz delete mode 100644 icu4c-71_1-src.tgz.asc create mode 100644 icu4c-72_1-docs.zip create mode 100644 icu4c-72_1-docs.zip.asc create mode 100644 icu4c-72_1-src.tgz create mode 100644 icu4c-72_1-src.tgz.asc diff --git a/baselibs.conf b/baselibs.conf index e39ed5b..be8be27 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,5 +1,4 @@ -libicu71 - conflicts "libicu70- = 71.1" +libicu72 libicu-devel requires -libicu- - requires "libicu71- = " + requires "libicu72- = " diff --git a/icu-avoid-x87-excess-precision.diff b/icu-avoid-x87-excess-precision.diff index e177e79..2a67402 100644 --- a/icu-avoid-x87-excess-precision.diff +++ b/icu-avoid-x87-excess-precision.diff @@ -18,8 +18,8 @@ Index: icu/source/test/intltest/dcfmapts.cpp - ASSERT_EQUAL(345678901234567890LL, fd.getPluralOperand(PLURAL_OPERAND_I)); + volatile double xxa = fd.getPluralOperand(PLURAL_OPERAND_I); + ASSERT_EQUAL(345678901234567890LL, xxa); - ASSERT_EQUAL(FALSE, fd.hasIntegerValue()); - ASSERT_EQUAL(FALSE, fd.isNegative()); + ASSERT_EQUAL(false, fd.hasIntegerValue()); + ASSERT_EQUAL(false, fd.isNegative()); @@ -970,7 +971,8 @@ void IntlTestDecimalFormatAPI::TestFixed ASSERT_EQUAL(0, fd.getPluralOperand(PLURAL_OPERAND_T)); @@ -28,6 +28,6 @@ Index: icu/source/test/intltest/dcfmapts.cpp - ASSERT_EQUAL(223372036854775807LL, fd.getPluralOperand(PLURAL_OPERAND_I)); + volatile double xxb = fd.getPluralOperand(PLURAL_OPERAND_I); + ASSERT_EQUAL(223372036854775807LL, xxb); - ASSERT_EQUAL(TRUE, fd.hasIntegerValue()); - ASSERT_EQUAL(FALSE, fd.isNegative()); + ASSERT_EQUAL(true, fd.hasIntegerValue()); + ASSERT_EQUAL(false, fd.isNegative()); diff --git a/icu-error-reporting.diff b/icu-error-reporting.diff index e422a27..dcaab0a 100644 --- a/icu-error-reporting.diff +++ b/icu-error-reporting.diff @@ -48,10 +48,10 @@ Index: icu/source/tools/toolutil/writesrc.cpp +#include #include +#include + #include #include #include "unicode/utypes.h" - #include "unicode/putil.h" -@@ -65,8 +67,8 @@ usrc_createWithHeader(const char *path, +@@ -66,8 +68,8 @@ usrc_createWithoutHeader(const char *pat if (f==NULL) { fprintf( stderr, diff --git a/icu.changes b/icu.changes index adcca7b..86b849b 100644 --- a/icu.changes +++ b/icu.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Oct 19 11:22:26 UTC 2022 - Jan Engelhardt + +- Update to release 72.1 + * Support for Unicode 15, including new characters, scripts, + emoji, and corresponding API constants. + * Support for CLDR 42 locale data with various additions and + corrections. + * Shift to tzdb 2022e. Pre-1970 data for a number of timezones + has been removed. + ------------------------------------------------------------------- Mon Apr 25 14:21:31 UTC 2022 - Marcus Rueckert diff --git a/icu.keyring b/icu.keyring deleted file mode 100644 index bbc8c52..0000000 --- a/icu.keyring +++ /dev/null @@ -1,61 +0,0 @@ -pub rsa3072 2020-10-14 [SC] - 0E51E7F06EF719FBD072782A5F56E5AFA63CCD33 -uid [ultimate] Craig Cornelius (For use with ICU releases) -sig 3 5F56E5AFA63CCD33 2020-10-14 Craig Cornelius (For use with ICU releases) -sig 3 9B432B27D1BA20D7 2020-10-14 Fredrik Roubert -sub rsa3072 2020-10-14 [E] -sig 5F56E5AFA63CCD33 2020-10-14 Craig Cornelius (For use with ICU releases) - ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -=FdGa ------END PGP PUBLIC KEY BLOCK----- diff --git a/icu.spec b/icu.spec index 0023ff1..bcdc149 100644 --- a/icu.spec +++ b/icu.spec @@ -16,9 +16,9 @@ # -%define lname libicu71 -%define amajor 71 -%define aversion 71 +%define lname libicu72 +%define amajor 72 +%define aversion 72 %ifarch %armb hppa mips mips64 ppc ppc64 %sparc s390 s390x m68k %define be_platform 1 %else @@ -26,17 +26,16 @@ %endif # icu-versioning.diff needs update for new Version too Name: icu -Version: 71.1 +Version: 72.1 Release: 0 Summary: International Components for Unicode License: ICU Group: Development/Libraries/C and C++ URL: https://icu.unicode.org/ -Source: https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-src.tgz -Source2: https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-src.tgz.asc -Source3: https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-docs.zip -Source4: https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-docs.zip.asc -Source99: icu.keyring +Source: https://github.com/unicode-org/icu/releases/download/release-72-1/icu4c-72_1-src.tgz +Source2: https://github.com/unicode-org/icu/releases/download/release-72-1/icu4c-72_1-src.tgz.asc +Source3: https://github.com/unicode-org/icu/releases/download/release-72-1/icu4c-72_1-docs.zip +Source4: https://github.com/unicode-org/icu/releases/download/release-72-1/icu4c-72_1-docs.zip.asc Source100: baselibs.conf Patch4: icu-fix-install-mode-files.diff Patch6: icu-error-reporting.diff @@ -48,7 +47,7 @@ BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: python3-base BuildRequires: unzip -Provides: bundled(timezone) = 2021b +Provides: bundled(timezone) = 2022e %description ICU is a set of C and C++ libraries that provide extensive Unicode and locale @@ -64,9 +63,6 @@ This subpackage contains the runtime programs for interacting with ICU. Summary: International Components for Unicode Group: System/Libraries Requires: timezone -%if "%lname" == "libicu71" -Conflicts: libicu70 = 71.1 -%endif Provides: libicu = %version %if %be_platform Requires: libicu%aversion-bedata = %version diff --git a/icu4c-71_1-docs.zip b/icu4c-71_1-docs.zip deleted file mode 100644 index cc04289..0000000 --- a/icu4c-71_1-docs.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2b6ec8bc5234d0ebe47aaee3d1f80dcf3dba4fda666588531b07f5b0d9cffc8 -size 8136508 diff --git a/icu4c-71_1-docs.zip.asc b/icu4c-71_1-docs.zip.asc deleted file mode 100644 index e07932c..0000000 --- a/icu4c-71_1-docs.zip.asc +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQGzBAABCgAdFiEEDlHn8G73GfvQcngqX1blr6Y8zTMFAmJPbU4ACgkQX1blr6Y8 -zTMDQwv/fYn6sve3DrCEKzO1DY94k5PFqDb4wLlv52VsRUfWaOGamSOEpTrvxRBS -+lYdeR8hbfL09O6Iz1h7lhll4yvcgVunGBIqBUaSzee1QVhpXkRpI0uB42GhWKXQ -ndDZadomtSJc6We6Ln3bqOuhoZeGWGv72y3McEGqjg5+tlkciom46csc+TmUJX6t -3UiwARC6KXklKD1jIiWV5FhhPhQzXtA5+q/2ZYu3nuriAXGh6/0R1PQdad4N5ZFD -6wjBACZwy3pfjZCUQkrsfBpC/qpOhYQNxZqTSyv2sbIbV9owOkjLeYTCvww8OiO8 -ADp13alRNRZLQ4fQK+69y0w1BMuYoPaEM9PuQkpqCfT8QNQM3J+l23PUlMSoq0DW -k9f/JpVJw4K4pV0Am8euRLdb0NPf9IHhSwWxfxYGhJtplYyC9+BUlL/i/bbyRCGv -yWI4SZCQbxSnE/m99QB87+z+GAqLzB5+Hi6F6krMi/NC5jnepQlsrNhoDbXKp7Nu -K2YuBeYt -=+TMr ------END PGP SIGNATURE----- diff --git a/icu4c-71_1-src.tgz b/icu4c-71_1-src.tgz deleted file mode 100644 index 6f00e7a..0000000 --- a/icu4c-71_1-src.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf -size 25701340 diff --git a/icu4c-71_1-src.tgz.asc b/icu4c-71_1-src.tgz.asc deleted file mode 100644 index b298c7d..0000000 --- a/icu4c-71_1-src.tgz.asc +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQGzBAABCgAdFiEEDlHn8G73GfvQcngqX1blr6Y8zTMFAmJPbWAACgkQX1blr6Y8 -zTP6ZAv8CWbVfghWFO8dkBVgdYP8NnMr4AD2KWWzuURfG2TpVlo0fl1+8TyFp8uJ -8/IUVRfmoHiGQ+/20GTKZrUnYrdGP1xVJphoVN/2tlkZZQpVRiocRCnWx1J0r7oF -C6uuSnywR/GflpTyu3axIRwBc7kk5X0S1kwJ7IcKHCGeXQqu5JH6dQO6Aqbbq94G -pMzCS6m1TwIEf2duM5SzyJmJq8iVmLGkDxVvAYIU8cf4OQAjaQTZ3S3KEDnxG6+C -Hx3fKBcq1EqejQYcKvO5cGR1oq9FrgNHn7cFdpZZvRXS9zikrOflo+aBG4Mugj46 -9Q0yvrS4KIU/3rLp49IEApCGIUPKivRNPPwnbNRhAc1pndwbpcl0c5gSvhJKZwuQ -4TMZJG0hsLPje2CslsZsgo7h9Cf4EcT5/9YGuxco3iCcyxLb+NN5mxywNrBCCg0a -Mtu/XiQ/k5JqEc5/9ZH+mQDzW0lgR4cqne1lV6uClwykw1p50FobKH+pBGGzhTwJ -4AeWUuYS -=jH9v ------END PGP SIGNATURE----- diff --git a/icu4c-72_1-docs.zip b/icu4c-72_1-docs.zip new file mode 100644 index 0000000..0916bf7 --- /dev/null +++ b/icu4c-72_1-docs.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49109e06a0b2da13cd79029d76fa3c203d980e430cb8893ab19c5c78a4786bd2 +size 8442040 diff --git a/icu4c-72_1-docs.zip.asc b/icu4c-72_1-docs.zip.asc new file mode 100644 index 0000000..9c42490 --- /dev/null +++ b/icu4c-72_1-docs.zip.asc @@ -0,0 +1,14 @@ +-----BEGIN PGP SIGNATURE----- + +iQGzBAABCgAdFiEEPaNTAafDMCV7h1V1QFj2dAbqpqsFAmNPTZgACgkQQFj2dAbq +pqt/ZAv/bzyU7HpopB3icMYQDyWfCnuMg0NCtQiOxsWH4taBSIwrRAwuIQ1BlA+/ +Xp5FmbRCxiBSCdMrR5R6/IWVfDMoV7X3ASqPZDQduWDGm3lkAZCcR26sgBC0NNwA +6yWXzhLUZ0xQeEiBaxfH7K48/KWHlfUmBaXgWiWegcUn6GVPx/Nl1j2bus1kdg/1 +Gr+8pncxXdycuk6OH3FMYM8OWVqvX0g4qh7n743a7ScvsHN2vgv0D8zymKxLjWMK +EskksCnxacjlJ8FuveryrI+qPRpITJpPJIbVneBwghEf4nIC1zLu9N0L2NR3NLgw +DZ76QG3yc4DKB+plnWQGHB3pPKboD958X8PzKETMZE29ZYt6JuLLwyscwdG/IMkL +qaF0O5KTkKscy1HBRZECZWFAAXXuXSYVUgRcUl3mfoMV5Wlpj1s+lyy4JK4mlqIZ +ej5Sed3kRkWvbfRgzdOPdxZp7EDCUo/mB+agLLQUGxV4oWY34/g2ylaMlPg621H8 +dlQoECUF +=oRG7 +-----END PGP SIGNATURE----- diff --git a/icu4c-72_1-src.tgz b/icu4c-72_1-src.tgz new file mode 100644 index 0000000..730e41b --- /dev/null +++ b/icu4c-72_1-src.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68 +size 26303933 diff --git a/icu4c-72_1-src.tgz.asc b/icu4c-72_1-src.tgz.asc new file mode 100644 index 0000000..d72a6a1 --- /dev/null +++ b/icu4c-72_1-src.tgz.asc @@ -0,0 +1,14 @@ +-----BEGIN PGP SIGNATURE----- + +iQGzBAABCgAdFiEEPaNTAafDMCV7h1V1QFj2dAbqpqsFAmNPTl8ACgkQQFj2dAbq +pqvbAQv/d2G+tZ7ia1S6GM6s4fqAGsZLxTcuvDx0B/betBsPa9JAvdacK6kNKoDW +Eodo0PPhQPsJrtmIMcXXUaJUFnF0HN+DPSgd0sD+95rnzD/LTMGfA8Pjj0k/XJud +M6XyDPeTnr16J5a/iGGKLcCeDdw5B7EbiM4PYJ/UMmMrMg6JnyFQ0V26ii71cs0M +qwM1SVg7LX2sbDyyuRKxZ0C1e6QnBJyR+sDQU+CxuhYfrH8bdAZcjdTx/nbqWCaE +UI60XYAEnIP6BUWAcof63EAWwn7WfSJP9dmLRMnxH0CvOP7tpw43p6UScLkvKtvF +SjHBiD5OEgGoEjuiRYElOSMkrZQ/kYQj3EAE2TmMBLYZjC5NwzTaQGpLfuhGDihL +BBMle7iVkWrKrtevKb9gZ6NmKbnZLOst15elxDcs3iWIjpiZU198Hvqba7Iv/gr9 +/0xvjEVdOhv3DRsoQKDXmmxaP5yLRBjOwgJpfSkxnwT3V2GSK+zafubdNgbvmVJz +1r+1Sag6 +=019E +-----END PGP SIGNATURE-----