From b099691a3b7e6aded58f9bf6ebb0d940240105fc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 30 Oct 2023 08:24:30 +0100 Subject: update to 73.2 (from F39) --- gennorm2-man.patch | 6 +++--- icu-last.spec | 19 +++++++++++++------ icuinfo-man.patch | 8 ++++---- 3 files changed, 20 insertions(+), 13 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 d62ea50..f2a2174 100644 --- a/icu-last.spec +++ b/icu-last.spec @@ -1,4 +1,4 @@ -# remirepo spec file for icu71 +# remirepo spec file for icu73 # renamed for parallel installation, from: # # Fedora spec file for icu @@ -10,8 +10,8 @@ # %global srcname icu -%global soname 72 -%global subver 1 +%global soname 73 +%global subver 2 %bcond_without tests @@ -19,7 +19,7 @@ # (or update the timezone data update..). %global use_tzdata_update 0 # Adjust to version major; used in tzdata update. -%global icu_major 72 +%global icu_major 73 %if 0%{?fedora} == 34 || 0%{?rhel} == 9 # rhbz#2003359 crash in umtx_initImplPreInit() from unorm_normalize() @@ -112,8 +112,8 @@ Provides: lib%{srcname}-doc = %{version}-%{release} %prep %setup -q -n %{srcname} -%patch4 -p1 -b .gennorm2-man.patch -%patch5 -p1 -b .icuinfo-man.patch +%patch -P4 -p1 -b .gennorm2-man.patch +%patch -P5 -p1 -b .icuinfo-man.patch %if 1 sed -e '/SELFCHECK=1/d' -i source/Makefile.in @@ -181,6 +181,10 @@ install -p -m755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/icu-config %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 @@ -255,6 +259,9 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l %changelog +* Mon Oct 30 2023 Remi Collet - 73.2-1 +- update to 73.2 (from F39) + * Fri Apr 14 2023 Remi Collet - 72.1-1 - update to 72.1 (from F38) 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 -- cgit