From 342f9787acc45aa975ffd97df7ec9dc608beff5d Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Nov 30 2018 00:38:46 +0000 Subject: Update to latest upstream version --- diff --git a/icu4j.spec b/icu4j.spec index f1e78d7..216b93b 100644 --- a/icu4j.spec +++ b/icu4j.spec @@ -1,6 +1,9 @@ +%global gittag %(v=%{version}; echo "release-$v" | sed 's/\\./-/') +%global srctgz %(v=%{version}; echo "icu4j-$v" | sed 's/\\./_/') + Name: icu4j -Version: 62.1 -Release: 2%{?dist} +Version: 63.1 +Release: 1%{?dist} Epoch: 1 Summary: International Components for Unicode for Java # ICU itself is now covered by Unicode license, but still has contributed @@ -9,11 +12,13 @@ Summary: International Components for Unicode for Java License: Unicode and MIT and BSD and Public Domain URL: http://site.icu-project.org/ -#CAUTION -#to create a tarball use following procedure -#svn co http://source.icu-project.org/repos/icu/tags/release-62-1/icu4j/ icu4j-62.1 -#tar caf icu4j-.tar.xz icu4j-/ -Source0: icu4j-%{version}.tar.xz +Source0: https://github.com/unicode-org/icu/releases/download/%{gittag}/%{srctgz}.tgz + +# These pom templates are missing from the upstream source archive +# See https://github.com/unicode-org/icu/pull/294 +Source1: https://repo1.maven.org/maven2/com/ibm/icu/icu4j/%{version}/icu4j-%{version}.pom +Source2: https://repo1.maven.org/maven2/com/ibm/icu/icu4j-charset/%{version}/icu4j-charset-%{version}.pom +Source3: https://repo1.maven.org/maven2/com/ibm/icu/icu4j-localespi/%{version}/icu4j-localespi-%{version}.pom # Add better OSGi metadata to core jar Patch0: improve-osgi-manifest.patch @@ -61,7 +66,7 @@ Requires: java-javadoc API documentation for %{name}. %prep -%setup -q -n icu4j-%{version} +%setup -q -c %patch0 # Ivy local does not name these libs as icu4j expects @@ -76,6 +81,7 @@ 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/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/ @@ -83,6 +89,12 @@ mkdir -p ~/.ant/lib ant -Divy.mode=local -Doffline=true -Dicu4j.api.doc.jdk.link=%{_javadocdir}/java \ all check +# Temporary hack until https://github.com/unicode-org/icu/pull/294 is merged +mkdir -p maven/icu4j{,-charset,-localespi} +cp -p %{SOURCE1} maven/icu4j/pom.xml +cp -p %{SOURCE2} maven/icu4j-charset/pom.xml +cp -p %{SOURCE3} maven/icu4j-localespi/pom.xml + for jar in icu4j icu4j-charset icu4j-localespi ; do sed -i -e 's/@POMVERSION@/%{version}/' maven/$jar/pom.xml %mvn_artifact maven/$jar/pom.xml $jar.jar @@ -108,6 +120,9 @@ install -m 644 icu4j-localespi.jar %{buildroot}%{_javadir}/icu4j/ %license main/shared/licenses/* %changelog +* Tue Nov 27 2018 Mat Booth - 1:63.1-1 +- Update to latest upstream version + * Fri Jul 13 2018 Fedora Release Engineering - 1:62.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/improve-osgi-manifest.patch b/improve-osgi-manifest.patch index 821e48a..0d90892 100644 --- a/improve-osgi-manifest.patch +++ b/improve-osgi-manifest.patch @@ -1,20 +1,13 @@ ---- manifest.stub.orig 2014-11-17 14:56:10.568212293 +0000 -+++ manifest.stub 2014-11-17 15:00:31.395686692 +0000 -@@ -9,10 +9,28 @@ - Bundle-ManifestVersion: 2 - Bundle-Name: ICU4J - Bundle-Description: International Components for Unicode for Java --Bundle-SymbolicName: com.ibm.icu -+Bundle-SymbolicName: com.ibm.icu; singleton:=true - Bundle-Version: @IMPLVERSION@ - Bundle-Vendor: Unicode, Inc. +--- manifest.stub.orig 2018-11-27 10:26:04.174847598 +0000 ++++ manifest.stub 2018-11-27 10:27:14.685508767 +0000 +@@ -15,5 +15,23 @@ Bundle-Copyright: @COPYRIGHT@ Bundle-RequiredExecutionEnvironment: @EXECENV@ Main-Class: com.ibm.icu.util.VersionInfo --Export-Package: com.ibm.icu.lang,com.ibm.icu.math,com.ibm.icu.text,com.ibm.icu.util -\ No newline at end of file +-Export-Package: com.ibm.icu.lang,com.ibm.icu.math,com.ibm.icu.number,com.ibm.icu.text,com.ibm.icu.util +Export-Package: com.ibm.icu.lang;base=true;full=true;version="@IMPLVERSION@", + com.ibm.icu.math;base=true;full=true;version="@IMPLVERSION@", ++ com.ibm.icu.number;base=true;full=true;version="@IMPLVERSION@", + com.ibm.icu.text;base=true;full=true;version="@IMPLVERSION@", + com.ibm.icu.util;base=true;full=true;version="@IMPLVERSION@", + com.ibm.icu.impl;x-internal:=true, @@ -30,8 +23,8 @@ + com.ibm.icu.impl.data.icudt@DATAVERSION@b.zone;x-internal:=true, + com.ibm.icu.impl.duration;x-internal:=true, + com.ibm.icu.impl.locale;x-internal:=true -+Eclipse-LazyStart: true -+Eclipse-ExtensibleAPI: true ++Bundle-ActivationPolicy: lazy + Automatic-Module-Name: com.ibm.icu --- main/shared/build/common-targets.xml.orig 2014-11-17 14:59:05.335849961 +0000 +++ main/shared/build/common-targets.xml 2014-11-17 14:59:36.868423736 +0000 @@ -75,6 +75,7 @@ @@ -44,7 +37,7 @@ --- build.xml.orig 2014-11-17 21:45:53.308610711 +0000 +++ build.xml 2014-11-17 21:46:29.969096734 +0000 -@@ -693,6 +693,7 @@ +@@ -683,6 +683,7 @@ diff --git a/sources b/sources index e28e56e..e40859c 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ -SHA512 (icu4j-62.1.tar.xz) = 05153694c46d447b1c22de14d2e4f4eded1ca521f871105e5c7ef176bea7319aa811672c1c5b57cdcc6fedb440ea71a0f00b5faadacbc79738dbb392ec36d903 +SHA512 (icu4j-63_1.tgz) = cdbea9447548f17b23227075476127cc35e78ad7cc458eb400479a9eba719ba68c073491dda6ee451dee78f43cd5fc5bf388cea89019a00db26e5c0644e9d2b6 +SHA512 (icu4j-63.1.pom) = 47c35f180fffb62d3ca2eecf37c42bfc778127926411d58607c1bb90984e2232d0afc3b130dfe6f2e3741d5fb1743bb4c9eb90e23f057437673cfed37fc34ef0 +SHA512 (icu4j-charset-63.1.pom) = 15d64fe2c607b9fabca4ab5e708013af34db265feac88882bed3352c1d6ba794845a7dddb78a3fa22c11024140872a854b5a92a074e145102aaf4c3af39c60e4 +SHA512 (icu4j-localespi-63.1.pom) = 94b34cea5c4a4f723cd7f8c372d7b458b69705baac34e8ea08ee260d0dfb7a63419174579a4ccea8ceafdbb17bedc2d71a19176b2d1ef54baea37b4a8fd20af7