Update to 71.1

This commit is contained in:
František Zatloukal 2022-07-27 22:02:57 +02:00
parent ceba52d9ed
commit 34d52932dd
5 changed files with 21 additions and 70 deletions

2
.gitignore vendored
View File

@ -6,3 +6,5 @@
/timezoneTypes.txt /timezoneTypes.txt
/windowsZones.txt /windowsZones.txt
/zoneinfo64.txt /zoneinfo64.txt
/icu4c-71_1-src.tgz
/icu4c-71_1-data.zip

View File

@ -4,18 +4,18 @@
# (or update the timezone data update..). # (or update the timezone data update..).
%global use_tzdata_update 1 %global use_tzdata_update 1
# Adjust to version major; used in tzdata update. # Adjust to version major; used in tzdata update.
%global icu_major 69 %global icu_major 71
Name: icu Name: icu
Version: 69.1 Version: 71.1
Release: 7%{?dist} Release: 1%{?dist}
Summary: International Components for Unicode Summary: International Components for Unicode
License: MIT and UCD and Public Domain License: MIT and UCD and Public Domain
URL: http://site.icu-project.org/ URL: http://site.icu-project.org/
Source0: https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-src.tgz Source0: https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-src.tgz
%if 0%{?use_tzdata_update} %if 0%{?use_tzdata_update}
Source1: https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-data.zip Source1: https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-data.zip
Source2: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022a/44/metaZones.txt Source2: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022a/44/metaZones.txt
Source3: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022a/44/timezoneTypes.txt Source3: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022a/44/timezoneTypes.txt
Source4: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022a/44/windowsZones.txt Source4: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022a/44/windowsZones.txt
@ -31,8 +31,6 @@ Requires: lib%{name}%{?_isa} = %{version}-%{release}
Patch4: gennorm2-man.patch Patch4: gennorm2-man.patch
Patch5: icuinfo-man.patch Patch5: icuinfo-man.patch
Patch10: timezone-update.patch
Patch11: timezone-update-2022a.patch
%description %description
Tools and utilities for developing with icu. Tools and utilities for developing with icu.
@ -149,11 +147,13 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
%{_bindir}/gencnval %{_bindir}/gencnval
%{_bindir}/gendict %{_bindir}/gendict
%{_bindir}/genrb %{_bindir}/genrb
%{_bindir}/icuexportdata
%{_bindir}/makeconv %{_bindir}/makeconv
%{_bindir}/pkgdata %{_bindir}/pkgdata
%{_bindir}/uconv %{_bindir}/uconv
%{_sbindir}/* %{_sbindir}/*
%{_mandir}/man1/derb.1* %{_mandir}/man1/derb.1*
%{_mandir}/man1/icuexportdata.1*
%{_mandir}/man1/gencfu.1* %{_mandir}/man1/gencfu.1*
%{_mandir}/man1/gencnval.1* %{_mandir}/man1/gencnval.1*
%{_mandir}/man1/gendict.1* %{_mandir}/man1/gendict.1*
@ -193,6 +193,9 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
%changelog %changelog
* Wed Jul 27 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 71.1-1
- Update to 71.1
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 69.1-7 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 69.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
@ -579,7 +582,7 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
- drop integrated icu.icu5557.safety.patch - drop integrated icu.icu5557.safety.patch
* Thu Nov 20 2008 Caolán McNamara <caolanm@redhat.com> - 4.0-4 * Thu Nov 20 2008 Caolán McNamara <caolanm@redhat.com> - 4.0-4
- annoyingly upstream tarball was repacked apparently to remove - annoyingly upstream tarball was repacked apparently to remove
some unused/cached dirs some unused/cached dirs
* Sat Sep 06 2008 Caolán McNamara <caolanm@redhat.com> - 4.0-3 * Sat Sep 06 2008 Caolán McNamara <caolanm@redhat.com> - 4.0-3
@ -604,7 +607,7 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
- drop integrated icu.regexp.patch - drop integrated icu.regexp.patch
* Mon May 19 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-8 * Mon May 19 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-8
- add icu.icu6284.strictalias.patch and build with - add icu.icu6284.strictalias.patch and build with
strict-aliasing strict-aliasing
* Tue Mar 18 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-7 * Tue Mar 18 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-7
@ -615,7 +618,7 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
- Resolves: rhbz#437761 add icu.icu6213.bengali.worstcase.patch - Resolves: rhbz#437761 add icu.icu6213.bengali.worstcase.patch
* Mon Feb 04 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-5 * Mon Feb 04 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-5
- Resolves: rhbz#431401 split syllables on 1st 0d4d of a 0d4d + - Resolves: rhbz#431401 split syllables on 1st 0d4d of a 0d4d +
(>= 0d15 && <= 0d39) + 0d4d + 0d30 sequence (>= 0d15 && <= 0d39) + 0d4d + 0d30 sequence
* Thu Jan 31 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-4 * Thu Jan 31 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-4
@ -628,7 +631,7 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
* Fri Jan 11 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-2 * Fri Jan 11 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-2
- remove icu.icu5365.dependantvowels.patch and cleanup - remove icu.icu5365.dependantvowels.patch and cleanup
icu.icu5506.multiplevowels.patch as they patch and unpatch icu.icu5506.multiplevowels.patch as they patch and unpatch
eachother (thanks George Rhoten for pointing out that madness) eachother (thanks George Rhoten for pointing out that madness)
* Fri Jan 11 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-1 * Fri Jan 11 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-1
@ -669,7 +672,7 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
- drop integrated icu.icu5465.telegu.patch - drop integrated icu.icu5465.telegu.patch
* Wed Jun 13 2007 Caolán McNamara <caolanm@redhat.com> - 3.6-20 * Wed Jun 13 2007 Caolán McNamara <caolanm@redhat.com> - 3.6-20
- Resolves: rhbz#243984 change the icu group as it is libicu - Resolves: rhbz#243984 change the icu group as it is libicu
which is "System Environment/Libraries" not icu which is "System Environment/Libraries" not icu
* Mon Apr 30 2007 Caolán McNamara <caolanm@redhat.com> - 3.6-19 * Mon Apr 30 2007 Caolán McNamara <caolanm@redhat.com> - 3.6-19
@ -726,7 +729,7 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
- rh#206615# render malayam like pango - rh#206615# render malayam like pango
* Wed Sep 06 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-2 * Wed Sep 06 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-2
- fix rh#205252#/icu#5365 (gnome#121882#/#icu#4026#) to make icu - fix rh#205252#/icu#5365 (gnome#121882#/#icu#4026#) to make icu
like pango for multiple dependant vowels like pango for multiple dependant vowels
* Sun Sep 03 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-1 * Sun Sep 03 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-1
@ -779,7 +782,7 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
* Wed Aug 31 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 3.4-3 * Wed Aug 31 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 3.4-3
- Use dist - Use dist
- gcc32 does not understand -fstack-protector and - gcc32 does not understand -fstack-protector and
--param=ssp-buffer-size=4 --param=ssp-buffer-size=4
* Tue Aug 2 2005 Ville Skyttä <ville.skytta at iki.fi> - 3.4-2 * Tue Aug 2 2005 Ville Skyttä <ville.skytta at iki.fi> - 3.4-2

View File

@ -1,7 +1,7 @@
SHA512 (icu4c-69_1-data.zip) = 21c059d3e66d4c38fb3167c1b844fd8e6bad5bf2e4984170a888db63afda2296b73d91c21a4026bde4f8aefeecacf2e05bc061997844992bed989404387de317
SHA512 (metaZones.txt) = df996db132b1219ea7bd51e746d94d9d85a51cf8ed6b544c8d804a01c50d2be7147637da9ba66c96fdb18db383841e29daafc56a2fbc1bb0a83871a143f4a77a SHA512 (metaZones.txt) = df996db132b1219ea7bd51e746d94d9d85a51cf8ed6b544c8d804a01c50d2be7147637da9ba66c96fdb18db383841e29daafc56a2fbc1bb0a83871a143f4a77a
SHA512 (timezoneTypes.txt) = 92b34b17333fd8b0c2c0d95eb05a2286da9e978d306eb2a816ea0142438b811896930fb2de4a650243b126391acc45ce923b2719e58815fbd49a47a28c5a39f9 SHA512 (timezoneTypes.txt) = 92b34b17333fd8b0c2c0d95eb05a2286da9e978d306eb2a816ea0142438b811896930fb2de4a650243b126391acc45ce923b2719e58815fbd49a47a28c5a39f9
SHA512 (windowsZones.txt) = 0244076828692df657b48f05d0f1537ae0fb08f5f91ef8858e08097ce5df70363e11594ca24c735e71620504b68241ae4901a481ad59f1b6ec6b9eb28a30eda5 SHA512 (windowsZones.txt) = 0244076828692df657b48f05d0f1537ae0fb08f5f91ef8858e08097ce5df70363e11594ca24c735e71620504b68241ae4901a481ad59f1b6ec6b9eb28a30eda5
SHA512 (zoneinfo64.txt) = abd9a8eb932578d421af02430d167f2407cedd8d0b7b9d7eacaeb35252f9a690447761c5add4124fe759ffbb949343b800c582fef93adfedcd2f8e8d032960d4 SHA512 (zoneinfo64.txt) = abd9a8eb932578d421af02430d167f2407cedd8d0b7b9d7eacaeb35252f9a690447761c5add4124fe759ffbb949343b800c582fef93adfedcd2f8e8d032960d4
SHA512 (icu-config.sh) = 04e00dbbd40c84ef355f149ab8d20dd0fa7fa7abacac849ea065ebab5de2746c13626e61f2a543c5207aa246a5805d2d9e64be9221a40eb8314d720c7824d314 SHA512 (icu-config.sh) = 04e00dbbd40c84ef355f149ab8d20dd0fa7fa7abacac849ea065ebab5de2746c13626e61f2a543c5207aa246a5805d2d9e64be9221a40eb8314d720c7824d314
SHA512 (icu4c-69_1-src.tgz) = d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7 SHA512 (icu4c-71_1-src.tgz) = 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912
SHA512 (icu4c-71_1-data.zip) = 05eb134a963a541a280e49e4d0aca07e480fef14daa0108c8fb9add18c150c9d34c8cbc46386c07909d511f7777eb3ea9f494001f191b84a7de0be8047da8b56

View File

@ -1,30 +0,0 @@
diff -ru icu.orig/source/test/intltest/tztest.cpp icu/source/test/intltest/tztest.cpp
--- icu.orig/source/test/intltest/tztest.cpp 2022-05-04 17:26:12.863669497 +0200
+++ icu/source/test/intltest/tztest.cpp 2022-05-05 12:37:17.599192452 +0200
@@ -2011,6 +2011,25 @@
const char *alias;
const char *zone;
} excluded1[] = {
+ {"Africa/Accra", "Africa/Abidjan"},
+ {"America/Blanc-Sablon", "America/Port_of_Spain"},
+ {"America/Curacao", "America/Port_of_Spain"},
+ {"America/Kralendijk", "America/Port_of_Spain"},
+ {"America/Lower_Princes", "America/Port_of_Spain"},
+ {"America/Puerto_Rico", "America/Port_of_Spain"},
+ {"PRT", "America/Port_of_Spain"},
+ {"America/Aruba", "America/Port_of_Spain"},
+ {"America/Cayman", "America/Coral_Harbour"},
+ {"America/Panama", "America/Coral_Harbour"},
+ {"America/Curacao", "America/Port_of_Spain"},
+ {"America/Phoenix", "America/Creston"},
+ {"America/Nassau", "America/Montreal"},
+ {"Pacific/Port_Moresby", "Antarctica/DumontDUrville"},
+ {"Asia/Aden", "Antarctica/Syowa"},
+ {"Asia/Kuwait", "Antarctica/Syowa"},
+ {"Asia/Riyadh", "Antarctica/Syowa"},
+ {"US/Arizona", "America/Creston"},
+ {"PNT", "America/Creston"},
{"Africa/Addis_Ababa", "Africa/Nairobi"},
{"Africa/Asmera", "Africa/Nairobi"},
{"Africa/Bamako", "Africa/Abidjan"},
icu/source/test/intltest のみに存在: tztest.cpp.~1~

View File

@ -1,24 +0,0 @@
diff -ru icu.orig/source/test/cintltst/ccaltst.c icu/source/test/cintltst/ccaltst.c
--- icu.orig/source/test/cintltst/ccaltst.c 2021-04-08 02:10:27.000000000 +0200
+++ icu/source/test/cintltst/ccaltst.c 2021-12-08 18:48:26.731171253 +0100
@@ -274,7 +274,7 @@
tzver = ucal_getTZDataVersion(&status);
if (U_FAILURE(status)) {
log_err_status(status, "FAIL: ucal_getTZDataVersion() => %s\n", u_errorName(status));
- } else if (uprv_strlen(tzver) != 5 /*4 digits + 1 letter*/) {
+ } else if (uprv_strlen(tzver) != 5 /*4 digits + 1 letter*/ && uprv_strlen(tzver) != 6) {
log_err("FAIL: Bad version string was returned by ucal_getTZDataVersion\n");
} else {
log_verbose("PASS: ucal_getTZDataVersion returned %s\n", tzver);
diff -ru icu.orig/source/test/intltest/tztest.cpp icu/source/test/intltest/tztest.cpp
--- icu.orig/source/test/intltest/tztest.cpp 2021-04-08 02:10:27.000000000 +0200
+++ icu/source/test/intltest/tztest.cpp 2021-12-09 08:53:50.576419996 +0100
@@ -152,7 +152,7 @@
const char* tzver = TimeZone::getTZDataVersion(status);
if (U_FAILURE(status)) {
errcheckln(status, "FAIL: getTZDataVersion failed - %s", u_errorName(status));
- } else if (uprv_strlen(tzver) != 5 /* 4 digits + 1 letter */) {
+ } else if (uprv_strlen(tzver) != 5 && uprv_strlen(tzver) != 6 /* 4 digits + 1 letter */) {
errln((UnicodeString)"FAIL: getTZDataVersion returned " + tzver);
} else {
logln((UnicodeString)"tzdata version: " + tzver);