summaryrefslogtreecommitdiffstats
path: root/icu.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-02-05 14:42:54 +0100
committerRemi Collet <remi@remirepo.net>2019-02-05 14:42:54 +0100
commit8e8e37c203b44b957c6eba657b7ff1ecbff190bd (patch)
tree4544fba49727efeb85c830a05f79815ce9f1e772 /icu.spec
parentdcbccef4f2b8ebb08ff14d2443492f2c972bcd92 (diff)
backport RHEL-7.6 changesv50
Diffstat (limited to 'icu.spec')
-rw-r--r--icu.spec47
1 files changed, 43 insertions, 4 deletions
diff --git a/icu.spec b/icu.spec
index 943fb92..4874261 100644
--- a/icu.spec
+++ b/icu.spec
@@ -1,6 +1,6 @@
Name: icu
Version: 50.1.2
-Release: 15%{?dist}
+Release: 17%{?dist}
Summary: International Components for Unicode
Group: Development/Tools
License: MIT and UCD and Public Domain
@@ -10,8 +10,12 @@ Source0: http://download.icu-project.org/files/icu4c/50.1.2/icu4c-50_1_2-src.t
# See also http://site.icu-project.org/download/51#TOC-Known-Issues
Source1: http://download.icu-project.org/files/icu4c/51.1/icu-51-layout-fix-10107.tgz
Source2: icu-config.sh
+Source10: http://source.icu-project.org/repos/icu/data/trunk/tzdata/icunew/2018e/44/metaZones.txt
+Source11: http://source.icu-project.org/repos/icu/data/trunk/tzdata/icunew/2018e/44/timezoneTypes.txt
+Source12: http://source.icu-project.org/repos/icu/data/trunk/tzdata/icunew/2018e/44/windowsZones.txt
+Source13: http://source.icu-project.org/repos/icu/data/trunk/tzdata/icunew/2018e/44/zoneinfo64.txt
BuildRequires: doxygen, autoconf, python
-Requires: lib%{name} = %{version}-%{release}
+Requires: lib%{name}%{?_isa} = %{version}-%{release}
Patch1: icu.8198.revert.icu5431.patch
Patch2: icu.8800.freeserif.crash.patch
@@ -23,6 +27,7 @@ Patch7: icu.10143.memory.leak.crash.patch
Patch8: icu.10318.CVE-2013-2924_changeset_34076.patch
Patch9: icu.rhbz1074549.CVE-2013-5907.patch
Patch10: icu-testtwodigityear.patch
+Patch11: do-not-fail-intltest-because-of-changed-data.patch
%description
Tools and utilities for developing with icu.
@@ -46,7 +51,7 @@ customize the supplied services.
%package -n lib%{name}-devel
Summary: Development files for International Components for Unicode
Group: Development/Libraries
-Requires: lib%{name} = %{version}-%{release}
+Requires: lib%{name}%{?_isa} = %{version}-%{release}
Requires: pkgconfig
%description -n lib%{name}-devel
@@ -76,6 +81,20 @@ BuildArch: noarch
%patch8 -p1 -b .icu10318.CVE-2013-2924_changeset_34076.patch
%patch9 -p1 -b .icurhbz1074549.CVE-2013-5907.patch
%patch10 -p1 -b .icu-testtwodigityear.patch
+%patch11 -p1 -b .do-not-fail-intltest-because-of-changed-data.patch
+
+# http://userguide.icu-project.org/datetime/timezone#TOC-Updating-the-Time-Zone-Data
+# says:
+#
+# > ICU4C TZ update when ICU data is built into a shared library
+# > [...]
+# > Copy the downloaded .txt files into the ICU sources for your installation,
+# > in the subdirectory source/data/misc/
+# > [...]
+cp %{SOURCE10} source/data/misc/
+cp %{SOURCE11} source/data/misc/
+cp %{SOURCE12} source/data/misc/
+cp %{SOURCE13} source/data/misc/
%build
cd source
@@ -109,6 +128,17 @@ test -f uconfig.h.prepend && sed -e '/^#define __UCONFIG_H__/ r uconfig.h.prepen
make %{?_smp_mflags}
make %{?_smp_mflags} doc
+# remove the original timezone data and build the new data from the updated
+# zoneinfo64.txt file:
+%ifarch s390 s390x ppc ppc64
+rm -f ./data/out/build/icudt50b/zoneinfo64.res
+make -C data ./out/build/icudt50b/zoneinfo64.res
+%else
+rm -f ./data/out/build/icudt50l/zoneinfo64.res
+make -C data ./out/build/icudt50l/zoneinfo64.res
+%endif
+make
+
%install
rm -rf $RPM_BUILD_ROOT source/__docs
make %{?_smp_mflags} -C source install DESTDIR=$RPM_BUILD_ROOT
@@ -125,7 +155,10 @@ install -p -m755 -D %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/icu-config
if grep -q @VERSION@ source/tools/*/*.8 source/tools/*/*.1 source/config/*.1; then
exit 1
fi
-make %{?_smp_mflags} -C source check
+# add CINTLTST_OPTS=-w and INTLTEST_OPTS=-w
+# to turn the errors caused by the timezone data update
+# into warnings:
+make %{?_smp_mflags} -C source check CINTLTST_OPTS=-w INTLTEST_OPTS=-w
%post -n lib%{name} -p /sbin/ldconfig
@@ -183,6 +216,12 @@ make %{?_smp_mflags} -C source check
%doc source/__docs/%{name}/html/*
%changelog
+* Thu Jun 07 2018 Mike FABIAN <mfabian@redhat.com> - 50.1.2-17
+- Resolves: rhbz#1169339 Update timezone data to tz 2018e
+
+* Wed Aug 19 2015 Eike Rathke <erack@redhat.com> - 50.1.2-16
+- Resolves: rhbz#1254690 add %{?_isa} to Requires for multi-arch systems
+
* Tue Aug 19 2014 Eike Rathke <erack@redhat.com> - 50.1.2-15
- Resolves: rhbz#1126237 correct sources list file