From a67fae286f744e3af17d2acce9308974488f511a Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 23 Feb 2023 12:40:38 -0500 Subject: [PATCH] Import rpm: c8-stream-rhel8 --- .gitignore | 2 +- icu4j.spec | 26 ++++++-------------------- sources | 2 +- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 5dfe018..895c775 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/icu4j-65_1.tgz +SOURCES/icu4j-64_2.tgz diff --git a/icu4j.spec b/icu4j.spec index 35c8093..10e918c 100644 --- a/icu4j.spec +++ b/icu4j.spec @@ -2,8 +2,8 @@ %global srctgz %(v=%{version}; echo "icu4j-$v" | sed 's/\\./_/') Name: icu4j -Version: 65.1 -Release: 3%{?dist} +Version: 64.2 +Release: 1%{?dist} Epoch: 1 Summary: International Components for Unicode for Java # ICU itself is now covered by Unicode license, but still has contributed @@ -74,14 +74,15 @@ rm main/tests/core/src/com/ibm/icu/dev/test/format/DataDrivenFormatTest.java rm main/tests/core/src/com/ibm/icu/dev/test/calendar/DataDrivenCalendarTest.java rm main/tests/core/src/com/ibm/icu/dev/test/serializable/CompatibilityTest.java rm main/tests/core/src/com/ibm/icu/dev/test/serializable/CoverageTest.java -rm main/tests/core/src/com/ibm/icu/dev/test/util/LocaleMatcherTest.java +rm main/tests/core/src/com/ibm/icu/dev/test/util/XLocaleMatcherTest.java rm main/tests/charset/src/com/ibm/icu/dev/test/charset/TestConversion.java rm main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorDisorderedMarksTest.java %build export JAVA_HOME=%{_jvmdir}/java/ mkdir -p ~/.ant/lib -ant -Djavac.source=8 -Djavac.target=8 -Divy.mode=local -Doffline=true -Dicu4j.api.doc.jdk.link=%{_javadocdir}/java all +ant -Divy.mode=local -Doffline=true -Dicu4j.api.doc.jdk.link=%{_javadocdir}/java \ + all check for jar in icu4j icu4j-charset icu4j-localespi ; do sed -i -e 's/@POMVERSION@/%{version}/' maven/$jar/pom.xml @@ -108,21 +109,6 @@ install -m 644 icu4j-localespi.jar %{buildroot}%{_javadir}/icu4j/ %license main/shared/licenses/* %changelog -* Wed May 20 2020 Mat Booth - 1:65.1-3 -- Allow building on Java 11 - -* Wed Jan 29 2020 Fedora Release Engineering - 1:65.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jan 23 2020 Mat Booth - 1:65.1-1 -- Update to latest upstream release - -* Thu Dec 12 2019 Mat Booth - 1:64.2-3 -- Tests take too long on 32bit arm - -* Thu Jul 25 2019 Fedora Release Engineering - 1:64.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Thu Apr 25 2019 Mat Booth - 1:64.2-1 - Update to latest upstream release @@ -375,4 +361,4 @@ install -m 644 icu4j-localespi.jar %{buildroot}%{_javadir}/icu4j/ - First JPP 1.7 build * Sat Jan 29 2005 David Walluck 0:3.2-1jpp -- release (contributed by Mary Ellen Foster ) \ No newline at end of file +- release (contributed by Mary Ellen Foster ) diff --git a/sources b/sources index 97c678c..188e118 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA1 (icu4j-65_1.tgz) = 87636fc1c7ad98306c4f68169042dd96fc67be1c +SHA1 (icu4j-64_2.tgz) = 6814c890df211d8ece02fa4e27bbe353fc98fa70