diff --git a/0001-Improve-OSGi-manifest.patch b/0001-Improve-OSGi-manifest.patch new file mode 100644 index 0000000..80bc278 --- /dev/null +++ b/0001-Improve-OSGi-manifest.patch @@ -0,0 +1,67 @@ +From a32a6c5f0476cd3263da78849982c50df3e2e92f Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Fri, 24 Jul 2020 10:08:47 +0100 +Subject: [PATCH 1/2] Improve OSGi manifest + +--- + build.xml | 1 + + main/shared/build/common-targets.xml | 1 + + manifest.stub | 20 +++++++++++++++++++- + 3 files changed, 21 insertions(+), 1 deletion(-) + +diff --git a/build.xml b/build.xml +index 411ae76..3dde055 100644 +--- a/build.xml ++++ b/build.xml +@@ -684,6 +684,7 @@ + + + ++ + + + +diff --git a/main/shared/build/common-targets.xml b/main/shared/build/common-targets.xml +index 6f85a99..5778ef3 100644 +--- a/main/shared/build/common-targets.xml ++++ b/main/shared/build/common-targets.xml +@@ -75,6 +75,7 @@ + + + ++ + + + +diff --git a/manifest.stub b/manifest.stub +index 98e011f..b49ab15 100644 +--- a/manifest.stub ++++ b/manifest.stub +@@ -15,5 +15,23 @@ Bundle-Vendor: Unicode, Inc. + 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.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, ++ com.ibm.icu.impl.data;x-internal:=true, ++ com.ibm.icu.impl.data.icudt@DATAVERSION@b;x-internal:=true, ++ com.ibm.icu.impl.data.icudt@DATAVERSION@b.brkitr;x-internal:=true, ++ com.ibm.icu.impl.data.icudt@DATAVERSION@b.coll;x-internal:=true, ++ com.ibm.icu.impl.data.icudt@DATAVERSION@b.curr;x-internal:=true, ++ com.ibm.icu.impl.data.icudt@DATAVERSION@b.lang;x-internal:=true, ++ com.ibm.icu.impl.data.icudt@DATAVERSION@b.rbnf;x-internal:=true, ++ com.ibm.icu.impl.data.icudt@DATAVERSION@b.region;x-internal:=true, ++ com.ibm.icu.impl.data.icudt@DATAVERSION@b.translit;x-internal:=true, ++ 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 ++Bundle-ActivationPolicy: lazy + Automatic-Module-Name: com.ibm.icu +-- +2.26.2 + diff --git a/0002-Use-default-doclet.patch b/0002-Use-default-doclet.patch new file mode 100644 index 0000000..a851c7c --- /dev/null +++ b/0002-Use-default-doclet.patch @@ -0,0 +1,105 @@ +From dc2458b2ec4fae2b4d75758362a4149334d101d7 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Fri, 24 Jul 2020 10:12:54 +0100 +Subject: [PATCH 2/2] Use default doclet + +--- + build.xml | 26 ++++++-------------------- + 1 file changed, 6 insertions(+), 20 deletions(-) + +diff --git a/build.xml b/build.xml +index 3dde055..883c535 100644 +--- a/build.xml ++++ b/build.xml +@@ -423,7 +423,7 @@ + + + +- ++ + + + +@@ -1261,7 +1261,7 @@ + + + +- ++ + + + +@@ -1315,7 +1315,7 @@ + docencoding="UTF-8" + charset="UTF-8" + bottom="${icu4j.api.doc.copyright.footer}" +- additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar}${path.separator}${jcite.libs} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet -taglet ch.arrenbrecht.jcite.JCiteTaglet -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8" ++ additionalparam="${doclint.option} -breakiterator -use -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8" + link="${icu4j.api.doc.jdk.link}" + source="1.7" + stylesheetfile="${docs.style.sheet}" +@@ -1351,7 +1351,7 @@ + docencoding="UTF-8" + charset="UTF-8" + bottom="${icu4j.api.doc.copyright.footer}" +- additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet" ++ additionalparam="${doclint.option} -breakiterator -use" + link="${icu4j.api.doc.jdk.link}" + source="1.7" + failonerror="true"> +@@ -1396,7 +1396,7 @@ + docencoding="UTF-8" + charset="UTF-8" + bottom="${icu4j.api.doc.copyright.footer}" +- additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar}${path.separator}${jcite.libs} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet -taglet ch.arrenbrecht.jcite.JCiteTaglet -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8" ++ additionalparam="${doclint.option} -breakiterator -use -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8" + link="${icu4j.api.doc.jdk.link}" + source="1.7" + stylesheetfile="${docs.style.sheet}" +@@ -1435,7 +1435,7 @@ + docencoding="UTF-8" + charset="UTF-8" + bottom="${icu4j.api.doc.copyright.footer}" +- additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar}${path.separator}${jcite.libs} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet -taglet ch.arrenbrecht.jcite.JCiteTaglet -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8" ++ additionalparam="${doclint.option} -breakiterator -use -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8" + link="${icu4j.api.doc.jdk.link}" + source="1.7" + stylesheetfile="${docs.style.sheet}" +@@ -1619,7 +1619,6 @@ + + + +- + + + +@@ -1645,13 +1644,6 @@ + + + +- +- +- +- +- +- +- + + + +@@ -1691,12 +1683,6 @@ + + + +- +- +- +- +- +- + + + +-- +2.26.2 + diff --git a/icu4j.spec b/icu4j.spec index 5de327f..07b4478 100644 --- a/icu4j.spec +++ b/icu4j.spec @@ -3,7 +3,7 @@ Name: icu4j Version: 65.1 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: International Components for Unicode for Java # ICU itself is now covered by Unicode license, but still has contributed @@ -15,11 +15,14 @@ URL: http://site.icu-project.org/ Source0: https://github.com/unicode-org/icu/releases/download/%{gittag}/%{srctgz}.tgz # Add better OSGi metadata to core jar -Patch0: improve-osgi-manifest.patch +Patch0: 0001-Improve-OSGi-manifest.patch + +# Use default Doclet due to Doclet API changes in Java 9+ +# that prevent ICU's custom one from being built +Patch1: 0002-Use-default-doclet.patch BuildRequires: ant BuildRequires: ant-junit -BuildRequires: java-javadoc BuildRequires: javapackages-local BuildRequires: ivy-local @@ -61,7 +64,8 @@ API documentation for %{name}. %prep %setup -q -c -%patch0 +%patch0 -p1 +%patch1 -p1 # Ivy local does not name these libs as icu4j expects sed -i -e 's/junit-4.12/junit-SYSTEM/' \ @@ -81,7 +85,7 @@ rm main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorDisordere %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 -Djavac.source=8 -Djavac.target=8 -Divy.mode=local -Doffline=true -Ddoclint.option='-Xdoclint:none' -Dicu4j.api.doc.jdk.link= all for jar in icu4j icu4j-charset icu4j-localespi ; do sed -i -e 's/@POMVERSION@/%{version}/' maven/$jar/pom.xml @@ -108,6 +112,9 @@ install -m 644 icu4j-localespi.jar %{buildroot}%{_javadir}/icu4j/ %license main/shared/licenses/* %changelog +* Fri Jul 24 2020 Mat Booth - 1:65.1-4 +- Use default doclet to prevent doc build failures on Java 11 + * Wed May 20 2020 Mat Booth - 1:65.1-3 - Allow building on Java 11 diff --git a/improve-osgi-manifest.patch b/improve-osgi-manifest.patch deleted file mode 100644 index 0d90892..0000000 --- a/improve-osgi-manifest.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- 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.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, -+ com.ibm.icu.impl.data;x-internal:=true, -+ com.ibm.icu.impl.data.icudt@DATAVERSION@b;x-internal:=true, -+ com.ibm.icu.impl.data.icudt@DATAVERSION@b.brkitr;x-internal:=true, -+ com.ibm.icu.impl.data.icudt@DATAVERSION@b.coll;x-internal:=true, -+ com.ibm.icu.impl.data.icudt@DATAVERSION@b.curr;x-internal:=true, -+ com.ibm.icu.impl.data.icudt@DATAVERSION@b.lang;x-internal:=true, -+ com.ibm.icu.impl.data.icudt@DATAVERSION@b.rbnf;x-internal:=true, -+ com.ibm.icu.impl.data.icudt@DATAVERSION@b.region;x-internal:=true, -+ com.ibm.icu.impl.data.icudt@DATAVERSION@b.translit;x-internal:=true, -+ 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 -+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 @@ - - - -+ - - - ---- build.xml.orig 2014-11-17 21:45:53.308610711 +0000 -+++ build.xml 2014-11-17 21:46:29.969096734 +0000 -@@ -683,6 +683,7 @@ - - - -+ - - -