Hello community, here is the log from the commit of package icu4j for openSUSE:Factory checked in at 2018-01-13 21:40:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icu4j (Old) and /work/SRC/openSUSE:Factory/.icu4j.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icu4j" Sat Jan 13 21:40:19 2018 rev:11 rq:559365 version:60.2 Changes: -------- --- /work/SRC/openSUSE:Factory/icu4j/icu4j.changes 2017-09-29 11:57:46.338616667 +0200 +++ /work/SRC/openSUSE:Factory/.icu4j.new/icu4j.changes 2018-01-13 21:40:22.622407338 +0100 @@ -1,0 +2,15 @@ +Fri Dec 22 13:11:47 UTC 2017 - [email protected] + +- Version update to 60.2 + * jdk9 upstream fixes +- Obsoleted patches: + * icu4j-jdk9.patch + - Obsoleted by upstream fixes + * icu4j-taglet.patch + - Obsoleted by removal of the old style taglet removal +- Added patch: + * icu4j-jdk10plus.patch + - Fix build with jdk10 and possibly later jdks +- Don't build the ICUTaglet, since it depends on removed APIs + +------------------------------------------------------------------- Old: ---- icu4j-58.1.tar.xz icu4j-jdk9.patch icu4j-taglet.patch New: ---- icu4j-60.2.tar.xz icu4j-jdk10plus.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icu4j.spec ++++++ --- /var/tmp/diff_new_pack.37mpWx/_old 2018-01-13 21:40:24.086339119 +0100 +++ /var/tmp/diff_new_pack.37mpWx/_new 2018-01-13 21:40:24.090338932 +0100 @@ -18,7 +18,7 @@ Name: icu4j -Version: 58.1 +Version: 60.2 Release: 0 Summary: International Components for Unicode for Java License: MIT AND EPL-1.0 @@ -26,11 +26,10 @@ Url: http://site.icu-project.org/ #CAUTION #to create a tarball use following procedure -#svn co http://source.icu-project.org/repos/icu/icu4j/tags/release-54-1-1 icu4j-<version> +#svn co http://source.icu-project.org/repos/icu/tags/release-60-2/icu4j icu4j-<version> #tar caf icu4j-<version>.tar.xz icu4j-<version>/ Source0: %{name}-%{version}.tar.xz -Patch0: icu4j-jdk9.patch -Patch1: icu4j-taglet.patch +Patch0: icu4j-jdk10plus.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel @@ -65,7 +64,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 sed -i 's/\r//' APIChangeReport.html sed -i 's/\r//' readme.html @@ -74,6 +72,7 @@ sed --in-place "s/<date datetime=.*when=\"after\"\/>//" build.xml sed --in-place "/javac1.3/d" build.xml sed --in-place "s:%{_prefix}/lib:%{_libdir}:g" build.xml +rm -f tools/build/src/com/ibm/icu/dev/tool/docs/ICUTaglet*.java %build ant \ @@ -93,7 +92,7 @@ # maven stuff install -d -m 755 %{buildroot}%{_mavenpomdir} -cp pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +cp maven/icu4j/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap JPP-%{name}.pom %{name}.jar %files ++++++ icu4j-58.1.tar.xz -> icu4j-60.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/icu4j/icu4j-58.1.tar.xz /work/SRC/openSUSE:Factory/.icu4j.new/icu4j-60.2.tar.xz differ: char 25, line 1 ++++++ icu4j-jdk10plus.patch ++++++ --- icu4j-60.2/build.xml 2017-12-22 13:42:19.176489521 +0100 +++ icu4j-60.2/build.xml 2017-12-22 14:05:58.358749213 +0100 @@ -102,10 +102,20 @@ <matches string="${java.version}" pattern="9((-.|\.\d).*)?"/> </condition> + <condition property="is.java10"> + <matches string="${java.version}" pattern="10((-.|\.\d).*)?"/> + </condition> + + <condition property="is.java11"> + <matches string="${java.version}" pattern="11((-.|\.\d).*)?"/> + </condition> + <condition property="is.java8.plus"> <or> <isset property="is.java8"/> <isset property="is.java9"/> + <isset property="is.java10"/> + <isset property="is.java11"/> </or> </condition> @@ -1317,9 +1327,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}" - source="1.5" + source="1.6" stylesheetfile="${docs.style.sheet}" failonerror="true"> <packageset dir="${icu4j.core.dir}/src"> @@ -1353,9 +1361,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}" - source="1.5" + source="1.6" failonerror="true"> <packageset dir="${icu4j.core.dir}/src"> <include name="com/ibm/icu/lang/**"/> @@ -1398,7 +1404,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.5" stylesheetfile="${docs.style.sheet}" @@ -1437,7 +1443,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" link="${icu4j.api.doc.jdk.link}" source="1.5" stylesheetfile="${docs.style.sheet}"
