update to 71.1 (from F37)

3 files changed, 10 insertions, 63 deletions

diff --git a/icu-last.spec b/icu-last.spec
index 752f6d3..d7b3953 100644
--- a/icu-last.spec
+++ b/icu-last.spec
@@ -10,14 +10,14 @@
 #
 
 %global srcname       icu
-%global soname        69
+%global soname        71
 %global subver        1
 
 # Set to 0 when upgrading to a new ICU release that contains up-to-date timezone data.
 # (or update the timezone data update..).
 %global use_tzdata_update 1
 # Adjust to version major; used in tzdata update.
-%global icu_major 69
+%global icu_major 71
 
 %if 0%{?fedora} == 34 || 0%{?rhel} == 9
 # rhbz#2003359 crash in umtx_initImplPreInit() from unorm_normalize()
@@ -26,13 +26,13 @@
 
 Name:      icu%{soname}
 Version:   %{soname}.%{subver}
-Release:   4%{?dist}
+Release:   1%{?dist}
 Summary:   International Components for Unicode
 License:   MIT and UCD and Public Domain
 URL:       http://site.icu-project.org/
 Source0:   https://github.com/unicode-org/icu/releases/download/release-%{soname}-%{subver}/icu4c-%{soname}_%{subver}-src.tgz
 %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-%{soname}-%{subver}/icu4c-%{soname}_%{subver}-data.zip
 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
 Source4:   https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022a/44/windowsZones.txt
@@ -60,8 +60,6 @@ Provides:  %{srcname}%{?_isa} = %{version}-%{release}
 
 Patch4: gennorm2-man.patch
 Patch5: icuinfo-man.patch
-Patch10: timezone-update.patch
-Patch11: timezone-update-2022a.patch
 
 %description
 Tools and utilities for developing with icu.
@@ -114,10 +112,8 @@ Provides:  lib%{srcname}-doc      = %{version}-%{release}
 %setup -q -n %{srcname}
 %patch4 -p1 -b .gennorm2-man.patch
 %patch5 -p1 -b .icuinfo-man.patch
-%patch10 -p1 -b .up1
-%patch11 -p1 -b .up2
 
-%if 0%{?fedora} == 34 || 0%{?rhel} == 9
+%if 1
 sed -e '/SELFCHECK=1/d' -i source/Makefile.in
 %endif
 
@@ -209,11 +205,13 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
 %{_bindir}/gencnval
 %{_bindir}/gendict
 %{_bindir}/genrb
+%{_bindir}/icuexportdata
 %{_bindir}/makeconv
 %{_bindir}/pkgdata
 %{_bindir}/uconv
 %{_sbindir}/*
 %{_mandir}/man1/derb.1*
+%{_mandir}/man1/icuexportdata.1*
 %{_mandir}/man1/gencfu.1*
 %{_mandir}/man1/gencnval.1*
 %{_mandir}/man1/gendict.1*
@@ -253,6 +251,9 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
 
 
 %changelog
+* Tue Aug 16 2022 Remi Collet <remi@remirepo.net> - 71.1-1
+- update to 71.1 (from F37)
+
 * Tue Jul 26 2022 Remi Collet <remi@remirepo.net> - 69.1-4
 - Update timezone data to 2022a
 
diff --git a/timezone-update-2022a.patch b/timezone-update-2022a.patch
deleted file mode 100644
index 147a5b4..0000000
--- a/timezone-update-2022a.patch
+++ /dev/null
@@ -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~
diff --git a/timezone-update.patch b/timezone-update.patch
deleted file mode 100644
index 190a9f8..0000000
--- a/timezone-update.patch
+++ /dev/null
@@ -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);