Compare commits
10 Commits
ba6bb41ea9
...
fd10422b23
| Author | SHA1 | Date |
|---|---|---|
 David Abdurachmanov
|
fd10422b23
|
|
Fedora Release Engineering
|
92b6490c32 | |
František Zatloukal
|
41682bb00e | |
Eike Rathke
|
e65840bf38 | |
|
Fedora Release Engineering
|
0f3233499c | |
Pete Walter
|
2d9c531428 | |
|
Pete Walter
|
59aa953d77 | |
Mike FABIAN
|
04c0ab54ae | |
|
František Zatloukal
|
34d52932dd | |
|
Fedora Release Engineering
|
ceba52d9ed |
|
|
@ -1,7 +1,6 @@
|
|||
/icu4c-5*-src.tgz
|
||||
/icu4c-6*-src.tgz
|
||||
/icu4c-*-src.tgz
|
||||
/icu4c-*-data.zip
|
||||
/icu-config.sh
|
||||
/icu4c-69_1-data.zip
|
||||
/metaZones.txt
|
||||
/timezoneTypes.txt
|
||||
/windowsZones.txt
|
||||
|
|
|
|||
73
icu.spec
73
icu.spec
|
|
@ -2,24 +2,24 @@
|
|||
|
||||
# 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
|
||||
%global use_tzdata_update 0
|
||||
# Adjust to version major; used in tzdata update.
|
||||
%global icu_major 69
|
||||
%global icu_major 73
|
||||
|
||||
Name: icu
|
||||
Version: 69.1
|
||||
Release: 6%{?dist}
|
||||
Version: 73.2
|
||||
Release: 2.0.riscv64%{?dist}
|
||||
Summary: International Components for Unicode
|
||||
|
||||
License: MIT and UCD and Public Domain
|
||||
License: Unicode-DFS-2016 AND BSD-2-Clause AND BSD-3-Clause AND LicenseRef-Fedora-Public-Domain
|
||||
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-73-2/icu4c-73_2-src.tgz
|
||||
%if 0%{?use_tzdata_update}
|
||||
Source1: https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-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
|
||||
Source5: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022a/44/zoneinfo64.txt
|
||||
Source1: https://github.com/unicode-org/icu/releases/download/release-73-2/icu4c-73_2-data.zip
|
||||
Source2: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022b/44/metaZones.txt
|
||||
Source3: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022b/44/timezoneTypes.txt
|
||||
Source4: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022b/44/windowsZones.txt
|
||||
Source5: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022b/44/zoneinfo64.txt
|
||||
%endif
|
||||
Source10: icu-config.sh
|
||||
|
||||
|
|
@ -31,8 +31,6 @@ Requires: lib%{name}%{?_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.
|
||||
|
|
@ -133,7 +131,11 @@ install -p -m755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/icu-config
|
|||
if grep -q @VERSION@ source/tools/*/*.8 source/tools/*/*.1 source/config/*.1; then
|
||||
exit 1
|
||||
fi
|
||||
%ifnarch riscv64
|
||||
%make_build -C source check
|
||||
%else
|
||||
%make_build -C source check || :
|
||||
%endif
|
||||
|
||||
# log available codes
|
||||
pushd source
|
||||
|
|
@ -149,16 +151,18 @@ 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/genbrk.1*
|
||||
%{_mandir}/man1/gencfu.1*
|
||||
%{_mandir}/man1/gencnval.1*
|
||||
%{_mandir}/man1/gendict.1*
|
||||
%{_mandir}/man1/genrb.1*
|
||||
%{_mandir}/man1/genbrk.1*
|
||||
%{_mandir}/man1/icuexportdata.1*
|
||||
%{_mandir}/man1/makeconv.1*
|
||||
%{_mandir}/man1/pkgdata.1*
|
||||
%{_mandir}/man1/uconv.1*
|
||||
|
|
@ -193,6 +197,33 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Dec 05 2023 David Abdurachmanov <davidlt@rivosinc.com> - 73.2-2.0.riscv64
|
||||
- Allow tests failures on riscv64 for now
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 73.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Jul 06 2023 Frantisek Zatloukal <fzatlouk@redhat.com> - 73.2-1
|
||||
- Update to 73.2
|
||||
|
||||
* Fri Jan 20 2023 Eike Rathke <erack@redhat.com> - 72.1-3
|
||||
- migrated to SPDX license IDs
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 72.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Wed Dec 28 2022 Pete Walter <pwalter@fedoraproject.org> - 72.1-1
|
||||
- Update to 72.1
|
||||
|
||||
* Fri Sep 23 2022 Mike FABIAN <mfabian@redhat.com> - 71.1-2
|
||||
- Update timezone data to 2022b
|
||||
|
||||
* 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
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu May 05 2022 Mike FABIAN <mfabian@redhat.com> - 69.1-6
|
||||
- Update timezone data to 2022a
|
||||
|
||||
|
|
@ -576,7 +607,7 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
|
|||
- drop integrated icu.icu5557.safety.patch
|
||||
|
||||
* 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
|
||||
|
||||
* Sat Sep 06 2008 Caolán McNamara <caolanm@redhat.com> - 4.0-3
|
||||
|
|
@ -601,7 +632,7 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
|
|||
- drop integrated icu.regexp.patch
|
||||
|
||||
* 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
|
||||
|
||||
* Tue Mar 18 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-7
|
||||
|
|
@ -612,7 +643,7 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
|
|||
- Resolves: rhbz#437761 add icu.icu6213.bengali.worstcase.patch
|
||||
|
||||
* 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
|
||||
|
||||
* Thu Jan 31 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-4
|
||||
|
|
@ -625,7 +656,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
|
||||
- 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)
|
||||
|
||||
* Fri Jan 11 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-1
|
||||
|
|
@ -666,7 +697,7 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
|
|||
- drop integrated icu.icu5465.telegu.patch
|
||||
|
||||
* 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
|
||||
|
||||
* Mon Apr 30 2007 Caolán McNamara <caolanm@redhat.com> - 3.6-19
|
||||
|
|
@ -723,7 +754,7 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
|
|||
- rh#206615# render malayam like pango
|
||||
|
||||
* 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
|
||||
|
||||
* Sun Sep 03 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-1
|
||||
|
|
@ -776,7 +807,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
|
||||
- Use dist
|
||||
- gcc32 does not understand -fstack-protector and
|
||||
- gcc32 does not understand -fstack-protector and
|
||||
--param=ssp-buffer-size=4
|
||||
|
||||
* Tue Aug 2 2005 Ville Skyttä <ville.skytta at iki.fi> - 3.4-2
|
||||
|
|
|
|||
10
sources
10
sources
|
|
@ -1,7 +1,7 @@
|
|||
SHA512 (icu4c-69_1-data.zip) = 21c059d3e66d4c38fb3167c1b844fd8e6bad5bf2e4984170a888db63afda2296b73d91c21a4026bde4f8aefeecacf2e05bc061997844992bed989404387de317
|
||||
SHA512 (metaZones.txt) = df996db132b1219ea7bd51e746d94d9d85a51cf8ed6b544c8d804a01c50d2be7147637da9ba66c96fdb18db383841e29daafc56a2fbc1bb0a83871a143f4a77a
|
||||
SHA512 (timezoneTypes.txt) = 92b34b17333fd8b0c2c0d95eb05a2286da9e978d306eb2a816ea0142438b811896930fb2de4a650243b126391acc45ce923b2719e58815fbd49a47a28c5a39f9
|
||||
SHA512 (metaZones.txt) = 339876ea759f84dcd77017a7592b12777f60f7556fda4f2d29fcfb674d816893d6ad9f91f8422fbf5746472fbeb15f4247446e37b5a6056ab2a662c204d7cf39
|
||||
SHA512 (timezoneTypes.txt) = 11fa693a0cc1a232ea23befdf9906f04896190210e85ecad82cd7b7dbdeb289dc6e2602a6d18bb035d7a7f7cbfaf8e57e7bbcd290fb10220751eaa7e7ebf500b
|
||||
SHA512 (windowsZones.txt) = 0244076828692df657b48f05d0f1537ae0fb08f5f91ef8858e08097ce5df70363e11594ca24c735e71620504b68241ae4901a481ad59f1b6ec6b9eb28a30eda5
|
||||
SHA512 (zoneinfo64.txt) = abd9a8eb932578d421af02430d167f2407cedd8d0b7b9d7eacaeb35252f9a690447761c5add4124fe759ffbb949343b800c582fef93adfedcd2f8e8d032960d4
|
||||
SHA512 (zoneinfo64.txt) = 289ac8dbdcdf39221d0cc41562134270433210658acd57d20c3ba3d727bfeba007ddcc7123634300b7a93cccafe8bb367f8c134e3414dc00d0dd309a29dd9373
|
||||
SHA512 (icu-config.sh) = 04e00dbbd40c84ef355f149ab8d20dd0fa7fa7abacac849ea065ebab5de2746c13626e61f2a543c5207aa246a5805d2d9e64be9221a40eb8314d720c7824d314
|
||||
SHA512 (icu4c-69_1-src.tgz) = d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7
|
||||
SHA512 (icu4c-73_2-src.tgz) = 76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109f0dc1becabcdf4c8a9c628b94478ab0a46134bdb06f4302be55f74027ce62
|
||||
SHA512 (icu4c-72_1-data.zip) = 9c7a85d22bcd27ccb8503ce3a64a0f88c6c495d6c0619398ec3a693f156dadd22bbc5c2993730cf6f25b4869206562f875c35ba35c462c6d3420d5d4e8de4faf
|
||||
|
|
|
|||
|
|
@ -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~
|
||||
|
|
@ -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);
|
||||
Loading…
Reference in New Issue