Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package icu4j for openSUSE:Factory checked in at 2022-03-24 22:58:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icu4j (Old) and /work/SRC/openSUSE:Factory/.icu4j.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icu4j" Thu Mar 24 22:58:38 2022 rev:17 rq:964691 version:70.1 Changes: -------- --- /work/SRC/openSUSE:Factory/icu4j/icu4j.changes 2020-04-27 23:29:59.134540325 +0200 +++ /work/SRC/openSUSE:Factory/.icu4j.new.1900/icu4j.changes 2022-03-24 23:00:49.804414431 +0100 @@ -1,0 +2,14 @@ +Thu Mar 24 14:17:28 UTC 2022 - Fridrich Strba <[email protected]> + +- Upgrade to verison 70.1 +- Modified patches: + * icu4j-66.1-java8compat.patch -> icu4j-70.1-java8compat.patch + * icu4j-jdk10plus.patch + + rediff to changed context + * improve-osgi-manifest.patch + + replace also DATAVERSION token during the build +- Added patch: + * icu4j-javadoc.patch + + fix invalid html entities + +------------------------------------------------------------------- Old: ---- icu4j-66.1-java8compat.patch icu4j-67_1.tgz New: ---- icu4j-70.1-java8compat.patch icu4j-70_1.tgz icu4j-javadoc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icu4j.spec ++++++ --- /var/tmp/diff_new_pack.41Cla5/_old 2022-03-24 23:00:50.468415072 +0100 +++ /var/tmp/diff_new_pack.41Cla5/_new 2022-03-24 23:00:50.476415079 +0100 @@ -1,7 +1,7 @@ # # spec file for package icu4j # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2000-2007, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -17,7 +17,7 @@ # -%global majorver 67 +%global majorver 70 %global minorver 1 Name: icu4j Version: %{majorver}.%{minorver} @@ -26,14 +26,15 @@ # ICU itself is now covered by Unicode license, but still has contributed # components covered by MIT and BSD licenses # Data from the Timezone Database is Public Domain -License: Unicode AND MIT AND BSD-3-Clause AND SUSE-Public-Domain +License: BSD-3-Clause AND MIT AND Unicode AND SUSE-Public-Domain Group: Development/Libraries/Java URL: http://site.icu-project.org/ Source0: https://github.com/unicode-org/icu/releases/download/release-%{majorver}-%{minorver}/%{name}-%{majorver}_%{minorver}.tgz Patch0: icu4j-jdk10plus.patch # Add better OSGi metadata to core jar Patch1: improve-osgi-manifest.patch -Patch2: icu4j-66.1-java8compat.patch +Patch2: icu4j-70.1-java8compat.patch +Patch3: icu4j-javadoc.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel @@ -83,6 +84,7 @@ %patch0 -p1 %patch1 %patch2 -p1 +%patch3 -p1 sed -i 's/\r//' APIChangeReport.html sed -i 's/\r//' readme.html @@ -117,8 +119,10 @@ rm main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorDisorderedMarksTest.java %build -ant \ - -Dicu4j.javac.source=1.7 -Dicu4j.javac.target=1.7 \ +%ant \ + -Djavac.source=1.8 -Djavac.target=1.8 \ + -Ddoclint.option='-Xdoclint:none' \ + -Dicu4j.api.doc.jdk.link= \ jar docs for jar in icu4j icu4j-charset icu4j-localespi ; do ++++++ icu4j-66.1-java8compat.patch -> icu4j-70.1-java8compat.patch ++++++ ++++ 2695 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/icu4j/icu4j-66.1-java8compat.patch ++++ and /work/SRC/openSUSE:Factory/.icu4j.new.1900/icu4j-70.1-java8compat.patch ++++++ icu4j-67_1.tgz -> icu4j-70_1.tgz ++++++ /work/SRC/openSUSE:Factory/icu4j/icu4j-67_1.tgz /work/SRC/openSUSE:Factory/.icu4j.new.1900/icu4j-70_1.tgz differ: char 13, line 1 ++++++ icu4j-javadoc.patch ++++++ --- a/main/classes/core/src/com/ibm/icu/number/NumberRangeFormatter.java 2021-04-07 16:50:27.000000000 -0600 +++ b/main/classes/core/src/com/ibm/icu/number/NumberRangeFormatter.java 2021-08-24 09:51:20.411499180 -0600 @@ -20,7 +20,7 @@ import com.ibm.icu.util.ULocale; * .locale(ULocale.UK) * .formatRange(750, 1.2) * .toString(); - * // => "750 m - 1.2 km" + * // → "750 m - 1.2 km" * </pre> * <p> * Like NumberFormatter, NumberRangeFormatter instances (i.e., LocalizedNumberRangeFormatter --- a/main/classes/core/src/com/ibm/icu/text/SpoofChecker.java 2021-08-24 09:24:05.359581150 -0600 +++ b/main/classes/core/src/com/ibm/icu/text/SpoofChecker.java 2021-08-24 09:54:31.851818377 -0600 @@ -129,7 +129,7 @@ import com.ibm.icu.util.ULocale; * SpoofChecker sc = new SpoofChecker.Builder() * .setAllowedChars(SpoofChecker.RECOMMENDED.cloneAsThawed().addAll(SpoofChecker.INCLUSION)) * .setRestrictionLevel(SpoofChecker.RestrictionLevel.MODERATELY_RESTRICTIVE) - * .setChecks(SpoofChecker.ALL_CHECKS &~ SpoofChecker.CONFUSABLE) + * .setChecks(SpoofChecker.ALL_CHECKS &~ SpoofChecker.CONFUSABLE) * .build(); * boolean result = sc.failsChecks("p??yp??l"); // with Cyrillic '??' characters * System.out.println(result); // true @@ -150,7 +150,7 @@ import com.ibm.icu.util.ULocale; * SpoofChecker sc = new SpoofChecker.Builder() * .setAllowedChars(SpoofChecker.RECOMMENDED.cloneAsThawed().addAll(SpoofChecker.INCLUSION)) * .setRestrictionLevel(SpoofChecker.RestrictionLevel.MODERATELY_RESTRICTIVE) - * .setChecks(SpoofChecker.ALL_CHECKS &~ SpoofChecker.CONFUSABLE) + * .setChecks(SpoofChecker.ALL_CHECKS &~ SpoofChecker.CONFUSABLE) * .build(); * SpoofChecker.CheckResult checkResult = new SpoofChecker.CheckResult(); * boolean result = sc.failsChecks("p??yp??l", checkResult); ++++++ icu4j-jdk10plus.patch ++++++ --- /var/tmp/diff_new_pack.41Cla5/_old 2022-03-24 23:00:50.600415199 +0100 +++ /var/tmp/diff_new_pack.41Cla5/_new 2022-03-24 23:00:50.604415203 +0100 @@ -1,24 +1,42 @@ ---- icu4j-66.1/build.xml 2020-03-11 19:21:41.000000000 +0100 -+++ icu4j-66.1/build.xml 2020-04-02 09:57:11.221067239 +0200 -@@ -1314,8 +1314,6 @@ +--- a/build.xml ++++ b/build.xml +@@ -423,7 +423,7 @@ + </patternset> + + <!-- meta build targets --> +- <target name="all" depends="info, main, tests, build-tools, tools, demos, samples, perf-tests, jar, docs" description="Build all primary targets"/> ++ <target name="all" depends="info, main, tests, tools, demos, samples, perf-tests, jar, docs" description="Build all primary targets"/> + <target name="main" depends="info, core, collate, charset, currdata, langdata, regiondata, translit, localespi" description="Build ICU4J runtime library classes"/> + <target name="tests" depends="info, core-tests, charset-tests, collate-tests, packaging-tests, translit-tests, localespi-tests" description="Build ICU4J test classes"/> + +@@ -1261,7 +1261,7 @@ + </target> + + <!-- doc targets --> +- <target name="docs" depends="info, build-tools, _checkJCite, _docsWithJCite, _docsWithoutJCite" description="Build API documents"/> ++ <target name="docs" depends="info, _checkJCite, _docsWithJCite, _docsWithoutJCite" description="Build API documents"/> + + <target name="docsStrict" description="Build API documents with all doclint check enabled"> + <condition property="doclint.option" value="-Xdoclint:all"> +@@ -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" -- link="${icu4j.api.doc.jdk.link}" ++ 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}" - failonerror="true"> -@@ -1350,8 +1348,6 @@ +@@ -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" -- link="${icu4j.api.doc.jdk.link}" ++ additionalparam="${doclint.option} -breakiterator -use" + link="${icu4j.api.doc.jdk.link}" source="1.7" failonerror="true"> - <packageset dir="${icu4j.core.dir}/src"> -@@ -1395,7 +1391,7 @@ +@@ -1396,7 +1396,7 @@ docencoding="UTF-8" charset="UTF-8" bottom="${icu4j.api.doc.copyright.footer}" @@ -27,13 +45,48 @@ link="${icu4j.api.doc.jdk.link}" source="1.7" stylesheetfile="${docs.style.sheet}" -@@ -1434,7 +1430,7 @@ +@@ -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 -tagletpath ${icu4j.build-tools.jar}${path.separator}${jcite.libs} -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 @@ + <packageset dir="${icu4j.charset.dir}/src"> + <include name="com/ibm/icu/charset/**"/> + </packageset> +- <doclet name="com.ibm.icu.dev.tool.docs.CheckTags" path="${icu4j.build-tools.jar}"/> + </javadoc> + </target> + +@@ -1645,13 +1644,6 @@ + <packageset dir="${icu4j.translit.dir}/src"> + <include name="com/ibm/icu/text/**"/> + </packageset> +- <doclet name="com.ibm.icu.dev.tool.docs.GatherAPIData" path="${icu4j.build-tools.jar}"> +- <param name="-name" value="ICU4J ${icu4j.impl.version}"/> +- <param name="-output" value="${out.dir}/icu4j${api.report.version}.api3"/> +- <param name="-internal"/> +- <param name="-version"/> +- <param name="-gzip"/> +- </doclet> + </javadoc> + </target> + +@@ -1691,12 +1683,6 @@ + <packageset dir="${icu4j.translit.dir}/src"> + <include name="com/ibm/icu/text/**"/> + </packageset> +- <doclet name="com.ibm.icu.dev.tool.docs.GatherAPIDataOld" path="${icu4j.build-tools.jar}"> +- <param name="-name" value="ICU4J ${icu4j.impl.version}"/> +- <param name="-output" value="${out.dir}/icu4j${api.report.version}.api"/> +- <param name="-internal"/> +- <param name="-gzip"/> +- </doclet> + </javadoc> + </target> + ++++++ improve-osgi-manifest.patch ++++++ --- /var/tmp/diff_new_pack.41Cla5/_old 2022-03-24 23:00:50.620415218 +0100 +++ /var/tmp/diff_new_pack.41Cla5/_new 2022-03-24 23:00:50.620415218 +0100 @@ -1,5 +1,25 @@ ---- manifest.stub.orig 2018-11-27 10:26:04.174847598 +0000 -+++ manifest.stub 2018-11-27 10:27:14.685508767 +0000 +--- build.xml 2022-03-20 01:20:17.315792163 +0100 ++++ build.xml 2022-03-20 01:20:55.698993273 +0100 +@@ -745,6 +745,7 @@ + <filterset> + <filter token="SPECVERSION" value="${jar.spec.version}"/> + <filter token="IMPLVERSION" value="${jar.impl.version}"/> ++ <filter token="DATAVERSION" value="${icu4j.data.version}"/> + <filter token="COPYRIGHT" value="${jar.copyright.info}"/> + <filter token="EXECENV" value="${jar.exec.env}"/> + </filterset> +--- main/shared/build/common-targets.xml 2021-10-28 08:02:09.000000000 +0200 ++++ main/shared/build/common-targets.xml 2022-03-20 01:20:55.698993273 +0100 +@@ -75,6 +75,7 @@ + <filterset> + <filter token="SPECVERSION" value="${jar.spec.version}"/> + <filter token="IMPLVERSION" value="${jar.impl.version}"/> ++ <filter token="DATAVERSION" value="${icu4j.data.version}"/> + <filter token="COPYRIGHT" value="${jar.copyright.info}"/> + <filter token="EXECENV" value="${jar.exec.env}"/> + </filterset> +--- manifest.stub 2021-10-28 08:02:10.000000000 +0200 ++++ manifest.stub 2022-03-20 01:20:55.698993273 +0100 @@ -15,5 +15,23 @@ Bundle-Copyright: @COPYRIGHT@ Bundle-RequiredExecutionEnvironment: @EXECENV@ @@ -25,24 +45,4 @@ + 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 @@ - <filterset> - <filter token="SPECVERSION" value="${jar.spec.version}"/> - <filter token="IMPLVERSION" value="${jar.impl.version}"/> -+ <filter token="DATAVERSION" value="${icu4j.data.version}"/> - <filter token="COPYRIGHT" value="${jar.copyright.info}"/> - <filter token="EXECENV" value="${jar.exec.env}"/> - </filterset> ---- 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 @@ - <filterset> - <filter token="SPECVERSION" value="${jar.spec.version}"/> - <filter token="IMPLVERSION" value="${jar.impl.version}"/> -+ <filter token="DATAVERSION" value="${icu4j.data.version}"/> - <filter token="COPYRIGHT" value="${jar.copyright.info}"/> - <filter token="EXECENV" value="${jar.exec.env}"/> - </filterset>
