From f207c40c333b1dc6dadcc2df5391a8c7bd64765a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 30 Aug 2024 09:35:35 +0200 Subject: update to 74.2 (from F40) --- icu-last.spec | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'icu-last.spec') diff --git a/icu-last.spec b/icu-last.spec index f2a2174..0b11461 100644 --- a/icu-last.spec +++ b/icu-last.spec @@ -1,4 +1,4 @@ -# remirepo spec file for icu73 +# remirepo spec file for icu74 # renamed for parallel installation, from: # # Fedora spec file for icu @@ -10,7 +10,7 @@ # %global srcname icu -%global soname 73 +%global soname 74 %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 73 +%global icu_major 74 %if 0%{?fedora} == 34 || 0%{?rhel} == 9 # rhbz#2003359 crash in umtx_initImplPreInit() from unorm_normalize() @@ -43,13 +43,8 @@ Source5: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/ic Source10: icu-config.sh BuildRequires: doxygen, autoconf >= 2.69, python3 -%if 0%{?rhel} == 7 -%global dtsenable source /opt/rh/devtoolset-10/enable -BuildRequires: devtoolset-10-toolchain -%else BuildRequires: gcc BuildRequires: gcc-c++ -%endif BuildRequires: make Requires: lib%{name}%{?_isa} = %{version}-%{release} @@ -62,6 +57,8 @@ Provides: %{srcname}%{?_isa} = %{version}-%{release} Patch4: gennorm2-man.patch Patch5: icuinfo-man.patch +# https://github.com/unicode-org/icu/pull/3046 +Patch6: python313-unittest.patch %description Tools and utilities for developing with icu. @@ -114,6 +111,7 @@ Provides: lib%{srcname}-doc = %{version}-%{release} %setup -q -n %{srcname} %patch -P4 -p1 -b .gennorm2-man.patch %patch -P5 -p1 -b .icuinfo-man.patch +%patch -P6 -p1 -b .python313 %if 1 sed -e '/SELFCHECK=1/d' -i source/Makefile.in @@ -197,13 +195,6 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l %endif -%if 0%{?fedora} < 28 && 0%{?rhel} < 8 -%post -n lib%{name} -p /sbin/ldconfig -%postun -n lib%{name} -p /sbin/ldconfig -%endif - -%{!?_licensedir:%global license %%doc} - %files %license license.html %exclude %{_datadir}/%{srcname}/*/LICENSE @@ -259,6 +250,9 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l %changelog +* Thu Aug 29 2024 Remi Collet - 74.2-1 +- update to 74.2 (from F40) + * Mon Oct 30 2023 Remi Collet - 73.2-1 - update to 73.2 (from F39) -- cgit