summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gennorm2-man.patch6
-rw-r--r--icu-last.spec58
-rw-r--r--icuinfo-man.patch8
-rw-r--r--timezone-update-2022a.patch30
-rw-r--r--timezone-update.patch24
5 files changed, 45 insertions, 81 deletions
diff --git a/gennorm2-man.patch b/gennorm2-man.patch
index 07b5b9d..c07ba32 100644
--- a/gennorm2-man.patch
+++ b/gennorm2-man.patch
@@ -80,7 +80,7 @@ diff -r -u -N icu.orig/source/tools/gennorm2/gennorm2.8.in icu/source/tools/genn
diff -r -u -N icu.orig/source/tools/gennorm2/Makefile.in icu/source/tools/gennorm2/Makefile.in
--- icu.orig/source/tools/gennorm2/Makefile.in 2013-01-11 01:23:32.000000000 +0100
+++ icu/source/tools/gennorm2/Makefile.in 2013-02-25 16:43:28.296062632 +0100
-@@ -16,8 +16,13 @@
+@@ -18,8 +18,13 @@
TARGET_STUB_NAME = gennorm2
@@ -95,7 +95,7 @@ diff -r -u -N icu.orig/source/tools/gennorm2/Makefile.in icu/source/tools/gennor
## Target information
TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
-@@ -44,12 +49,16 @@
+@@ -47,12 +52,16 @@
dist: dist-local
check: all check-local
@@ -114,7 +114,7 @@ diff -r -u -N icu.orig/source/tools/gennorm2/Makefile.in icu/source/tools/gennor
dist-local:
clean-local:
-@@ -70,6 +79,11 @@
+@@ -73,6 +82,11 @@
$(POST_BUILD_STEP)
diff --git a/icu-last.spec b/icu-last.spec
index 752f6d3..f2a2174 100644
--- a/icu-last.spec
+++ b/icu-last.spec
@@ -1,4 +1,4 @@
-# remirepo spec file for icu65
+# remirepo spec file for icu73
# renamed for parallel installation, from:
#
# Fedora spec file for icu
@@ -10,14 +10,16 @@
#
%global srcname icu
-%global soname 69
-%global subver 1
+%global soname 73
+%global subver 2
+
+%bcond_without tests
# 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
%if 0%{?fedora} == 34 || 0%{?rhel} == 9
# rhbz#2003359 crash in umtx_initImplPreInit() from unorm_normalize()
@@ -26,17 +28,17 @@
Name: icu%{soname}
Version: %{soname}.%{subver}
-Release: 4%{?dist}
+Release: 1%{?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-%{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
-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-%{soname}-%{subver}/icu4c-%{soname}_%{subver}-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
@@ -60,8 +62,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.
@@ -112,12 +112,10 @@ Provides: lib%{srcname}-doc = %{version}-%{release}
%prep
%setup -q -n %{srcname}
-%patch4 -p1 -b .gennorm2-man.patch
-%patch5 -p1 -b .icuinfo-man.patch
-%patch10 -p1 -b .up1
-%patch11 -p1 -b .up2
+%patch -P4 -p1 -b .gennorm2-man.patch
+%patch -P5 -p1 -b .icuinfo-man.patch
-%if 0%{?fedora} == 34 || 0%{?rhel} == 9
+%if 1
sed -e '/SELFCHECK=1/d' -i source/Makefile.in
%endif
@@ -179,9 +177,14 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.*
)
install -p -m755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/icu-config
+%if %{with tests}
%check
%{?dtsenable}
+# ignore test
+sed -e '/TestHebrewCalendarInTemporalLeapYear/s:TESTCASE_AUTO://TESTCASE_AUTO:' \
+ -i source/test/intltest/caltest.cpp
+
# test to ensure that -j(X>1) didn't "break" man pages. b.f.u #2357
if grep -q @VERSION@ source/tools/*/*.8 source/tools/*/*.1 source/config/*.1; then
exit 1
@@ -191,6 +194,7 @@ make %{?_smp_mflags} -C source check
# log available codes
pushd source
LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
+%endif
%if 0%{?fedora} < 28 && 0%{?rhel} < 8
@@ -209,16 +213,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*
@@ -253,6 +259,18 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
%changelog
+* Mon Oct 30 2023 Remi Collet <remi@remirepo.net> - 73.2-1
+- update to 73.2 (from F39)
+
+* Fri Apr 14 2023 Remi Collet <remi@remirepo.net> - 72.1-1
+- update to 72.1 (from F38)
+
+* Fri Oct 21 2022 Remi Collet <remi@remirepo.net> - 71.1-2
+- Update timezone data to 2022b
+
+* 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/icuinfo-man.patch b/icuinfo-man.patch
index 987e879..e53ffe1 100644
--- a/icuinfo-man.patch
+++ b/icuinfo-man.patch
@@ -86,7 +86,7 @@ diff -Nur orig.icu/source/tools/icuinfo/icuinfo.1.in icu/source/tools/icuinfo/ic
diff -Nur orig.icu/source/tools/icuinfo/Makefile.in icu/source/tools/icuinfo/Makefile.in
--- orig.icu/source/tools/icuinfo/Makefile.in 2015-10-08 05:53:56.000000000 +0200
+++ icu/source/tools/icuinfo/Makefile.in 2015-10-27 19:23:19.115509906 +0100
-@@ -14,8 +14,15 @@
+@@ -16,8 +16,15 @@
## Build directory information
subdir = tools/icuinfo
@@ -103,7 +103,7 @@ diff -Nur orig.icu/source/tools/icuinfo/Makefile.in icu/source/tools/icuinfo/Mak
## Target information
TARGET = icuinfo$(EXEEXT)
-@@ -35,7 +42,8 @@
+@@ -39,7 +46,8 @@
## List of phony targets
.PHONY : all all-local install install-local clean clean-local \
@@ -113,7 +113,7 @@ diff -Nur orig.icu/source/tools/icuinfo/Makefile.in icu/source/tools/icuinfo/Mak
## Clear suffix list
.SUFFIXES :
-@@ -48,12 +56,16 @@
+@@ -52,12 +60,16 @@
dist: dist-local
check: all check-local
@@ -132,7 +132,7 @@ diff -Nur orig.icu/source/tools/icuinfo/Makefile.in icu/source/tools/icuinfo/Mak
dist-local:
clean-local:
-@@ -103,6 +115,10 @@
+@@ -107,6 +119,10 @@
@echo "Plugins are disabled (use --enable-plugins to enable)"
endif
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);
generated by cgit (git 2.34.1) at 2024-04-19 08:03:17 +0000