Hello community, here is the log from the commit of package icu4j for openSUSE:Factory checked in at 2017-09-20 17:08:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icu4j (Old) and /work/SRC/openSUSE:Factory/.icu4j.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icu4j" Wed Sep 20 17:08:45 2017 rev:9 rq:526989 version:58.1 Changes: -------- --- /work/SRC/openSUSE:Factory/icu4j/icu4j.changes 2017-05-22 10:48:41.494697573 +0200 +++ /work/SRC/openSUSE:Factory/.icu4j.new/icu4j.changes 2017-09-20 17:08:49.138258684 +0200 @@ -1,0 +2,17 @@ +Mon Sep 18 10:17:38 UTC 2017 - fst...@suse.com + +- Added patches: + * icu4j-taglet.patch + + implement com.sun.tools.doclets.Taglet interface instead of + the deprecated + com.sun.tools.doclets.internal.toolkit.taglets.Taglet + + Fixes java.lang.ClassCastException with jdk9 + * icu4j-jdk9.patch + + Extend the jdk9 test, so that it accepts versions that start + with 9 + + Make source, target and encoding consistent all over the + build +- Specify source and target level 1.6 in order to allow building + with jdk9 + +------------------------------------------------------------------- New: ---- icu4j-jdk9.patch icu4j-taglet.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icu4j.spec ++++++ --- /var/tmp/diff_new_pack.DE5LYA/_old 2017-09-20 17:08:50.474070642 +0200 +++ /var/tmp/diff_new_pack.DE5LYA/_new 2017-09-20 17:08:50.478070079 +0200 @@ -21,7 +21,7 @@ Version: 58.1 Release: 0 Summary: International Components for Unicode for Java -License: MIT and EPL-1.0 +License: MIT AND EPL-1.0 Group: Development/Libraries/Java Url: http://site.icu-project.org/ #CAUTION @@ -29,7 +29,10 @@ #svn co http://source.icu-project.org/repos/icu/icu4j/tags/release-54-1-1 icu4j-<version> #tar caf icu4j-<version>.tar.xz icu4j-<version>/ Source0: %{name}-%{version}.tar.xz +Patch0: icu4j-jdk9.patch +Patch1: icu4j-taglet.patch BuildRequires: ant +BuildRequires: fdupes BuildRequires: java-devel BuildRequires: javapackages-local BuildRequires: javapackages-tools @@ -61,6 +64,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 sed -i 's/\r//' APIChangeReport.html sed -i 's/\r//' readme.html @@ -71,7 +76,10 @@ sed --in-place "s:%{_prefix}/lib:%{_libdir}:g" build.xml %build -ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 -Dj2se.apidoc=%{_javadocdir}/java jar docs +ant \ + -Dicu4j.javac.source=1.6 -Dicu4j.javac.target=1.6 \ + -Dj2se.apidoc=%{_javadocdir}/java \ + jar docs %install # jars @@ -81,6 +89,7 @@ # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -pr doc/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} # maven stuff install -d -m 755 %{buildroot}%{_mavenpomdir} @@ -88,10 +97,9 @@ %add_maven_depmap JPP-%{name}.pom %{name}.jar %files -%defattr(0644,root,root,0755) %doc readme.html APIChangeReport.html %{_javadir}/%{name}*.jar -%if %suse_version >= 1330 +%if 0%{?suse_version} >= 1330 %{_datadir}/maven-metadata/%{name}.xml* %else %{_mavendepmapfragdir}/%{name} @@ -99,7 +107,6 @@ %{_mavenpomdir}/*.pom %files javadoc -%defattr(0644,root,root,0755) %{_javadocdir}/%{name} %changelog ++++++ icu4j-jdk9.patch ++++++ --- icu4j-58.1/build.xml 2017-09-18 10:37:37.542916656 +0200 +++ icu4j-58.1/build.xml 2017-09-18 12:02:43.275291752 +0200 @@ -72,6 +72,7 @@ <contains string="${java.version}" substring="1.7."/> <contains string="${java.version}" substring="1.8."/> <contains string="${java.version}" substring="1.9."/> + <contains string="${java.version}" substring="9"/> </or> </condition> <fail message="The JDK version is too old or unknown."> @@ -95,7 +96,10 @@ </condition> <condition property="is.java9"> + <or> <contains string="${java.version}" substring="1.9."/> + <contains string="${java.version}" substring="9"/> + </or> </condition> <condition property="is.java7.plus"> @@ -955,9 +959,9 @@ docencoding="UTF-8" charset="UTF-8" bottom="<font size=-1>Copyright (c) ${current.year} IBM Corporation and others.</font>" - 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 com.ibm.icu.dev.tool.docs.ICUTaglet -taglet ch.arrenbrecht.jcite.JCiteTaglet -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=${java.src.encoding}" link="${icu4j.api.doc.jdk.link}" - source="1.5" + source="${javac.source}" stylesheetfile="${docs.style.sheet}" failonerror="true"> <packageset dir="${icu4j.core.dir}/src"> @@ -990,9 +994,9 @@ docencoding="UTF-8" charset="UTF-8" bottom="<font size=-1>Copyright (c) ${current.year} IBM Corporation and others.</font>" - additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet" + additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet -J-Dfile.encoding=${java.src.encoding}" link="${icu4j.api.doc.jdk.link}" - source="1.5" + source="${javac.source}" failonerror="true"> <packageset dir="${icu4j.core.dir}/src"> <include name="com/ibm/icu/lang/**"/> @@ -1222,7 +1226,7 @@ <!-- Release management targets --> <target name="checktags" depends="info, build-tools" description="Check API tags before release"> - <javadoc source="1.6" + <javadoc source="${javac.source}" bootclasspath="${java6.bootclasspath}" encoding="${java.src.encoding}"> <packageset dir="${icu4j.core.dir}/src"> @@ -1243,7 +1247,7 @@ <target name="gatherapi" depends="info, build-tools" description="Run API database generator tool"> <mkdir dir="${out.dir}"/> - <javadoc source="1.6" + <javadoc source="${javac.source}" bootclasspath="${java6.bootclasspath}" encoding="${java.src.encoding}"> <packageset dir="${icu4j.core.dir}/src"> @@ -1288,7 +1292,7 @@ <target name="gatherapiOld" depends="info, build-tools" description="Run API database generator tool (Pre Java 5 style)"> <mkdir dir="${out.dir}"/> - <javadoc source="1.6" + <javadoc source="${javac.source}" bootclasspath="${java6.bootclasspath}" encoding="${java.src.encoding}"> <packageset dir="${icu4j.core.dir}/src"> ++++++ icu4j-taglet.patch ++++++ --- icu4j-58.1/tools/build/src/com/ibm/icu/dev/tool/docs/ICUTaglet.java 2017-05-19 11:27:47.201137783 +0200 +++ icu4j-58.1/tools/build/src/com/ibm/icu/dev/tool/docs/ICUTaglet.java 2017-09-18 11:15:33.825002549 +0200 @@ -14,7 +14,7 @@ import java.util.Map; import com.sun.javadoc.Tag; -import com.sun.tools.doclets.internal.toolkit.taglets.Taglet; +import com.sun.tools.doclets.Taglet; public abstract class ICUTaglet extends ICUTagletAdapter implements Taglet { protected final String name;
