Hello community, here is the log from the commit of package hsqldb for openSUSE:Factory checked in at 2017-12-22 12:16:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hsqldb (Old) and /work/SRC/openSUSE:Factory/.hsqldb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hsqldb" Fri Dec 22 12:16:51 2017 rev:25 rq:557939 version:2.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/hsqldb/hsqldb.changes 2017-11-30 12:39:52.477953101 +0100 +++ /work/SRC/openSUSE:Factory/.hsqldb.new/hsqldb.changes 2017-12-22 12:16:53.711825729 +0100 @@ -1,0 +2,8 @@ +Mon Dec 18 07:05:16 UTC 2017 - [email protected] + +- Added patch: + * hsqldb-2.3.3-javadoc10.patch + + Fix build with jdk10's javadoc that ends in error when a + link cannot be downloaded + +------------------------------------------------------------------- New: ---- hsqldb-2.3.3-javadoc10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hsqldb.spec ++++++ --- /var/tmp/diff_new_pack.JKWnzD/_old 2017-12-22 12:16:54.763774437 +0100 +++ /var/tmp/diff_new_pack.JKWnzD/_new 2017-12-22 12:16:54.767774242 +0100 @@ -44,6 +44,8 @@ Patch0: %{name}-apidocs.patch # Package org.hsqldb.cmdline was only compiled with java 1.5 Patch1: %{name}-cmdline.patch +# Jdk10's javadoc ends up in error when a remote url cannot be reached +Patch2: hsqldb-2.3.3-javadoc10.patch BuildRequires: ant BuildRequires: fdupes # Needed for maven conversions @@ -123,6 +125,7 @@ %patch0 -p1 %patch1 -p1 +%patch2 -p2 %build export CLASSPATH=$(build-classpath servletapi5 junit) ++++++ hsqldb-2.3.3-javadoc10.patch ++++++ diff -urEbwB hsqldb-2.3.3/hsqldb/build/build.xml hsqldb-2.3.3.new/hsqldb/build/build.xml --- hsqldb-2.3.3/hsqldb/build/build.xml 2017-12-18 07:56:53.939190423 +0100 +++ hsqldb-2.3.3.new/hsqldb/build/build.xml 2017-12-18 07:59:13.211190949 +0100 @@ -895,58 +895,7 @@ </jar> </target> - <target name="-doclink-17" - depends="-set-jvmvars" - if="ant.java.iscjava17"> - <!-- The depends above is a Gradle work-around. - It is not necessary for Ant. --> - <property name="jse.doc.link" - value="http://docs.oracle.com/javase/7/docs/api/"/> - <property name="jee.doc.link" - value="http://docs.oracle.com/javaee/6/api/"/> - </target> - - <target name="-doclink-16" - depends="-doclink-17" - if="ant.java.iscjava16" - unless="ant.java.iscjava17"> - <property name="jse.doc.link" - value="http://docs.oracle.com/javase/6/docs/api/"/> - <property name="jee.doc.link" - value="http://docs.oracle.com/javaee/6/api/"/> - </target> - - <target name="-doclink-15" - depends="-doclink-16" - if="ant.java.iscjava15" - unless="ant.java.iscjava16"> - <property name="jse.doc.link" - value="http://docs.oracle.com/javase/1.5.0/docs/api/"/> - <property name="jee.doc.link" - value="http://docs.oracle.com/javaee/5/api/"/> - </target> - - <target name="-doclink-14" - depends="-doclink-15" - if="ant.java.iscjava14" - unless="ant.java.iscjava15"> - <property name="jse.doc.link" - value="http://docs.oracle.com/javase/1.4.2/docs/api/"/> - <property name="jee.doc.link" - value="http://docs.oracle.com/javaee/1.4/api/"/> - </target> - - <target name="-doclink-12" - depends="-doclink-14" - if="ant.java.iscjava12" - unless="ant.java.iscjava14"> - <property name="jse.doc.link" - value="http://docs.oracle.com/javase/1.3/docs/api/"/> - <property name="jee.doc.link" - value="http://docs.oracle.com/javaee/1.3/api/"/> - </target> - - <target name="javadoc" depends="-prepare-javadoc,-set-jvmvars,-doclink-12" + <target name="javadoc" depends="-prepare-javadoc,-set-jvmvars" description="Create javadoc for the distribution package"> <!-- TODO: Find out why JDBCDriver class is listed twice in the lass list pane, but only when All Classes selected @@ -991,8 +940,6 @@ <packageset dir='src'> <include name='org/hsqldb/jdbc'/> </packageset> - <link href="${jse.doc.link}"/> - <link href="${jee.doc.link}"/> <tag name="todo" enabled="false"/> <tag name="revised" enabled="false"/> <tag name="jboss.xmbean" enabled="false"/> @@ -1006,7 +953,7 @@ </target> <target name="javadocdev" - depends="-prepare-javadoc,-set-jvmvars,-doclink-12" + depends="-prepare-javadoc,-set-jvmvars" description="Create javadoc for all HSQLDB code-base classes"> <!-- Since our preprocessor package compilatoin depends on the env-specific ant runtime lib via includeAntRuntime=true, Javadoc @@ -1036,9 +983,6 @@ <pathelement location="${junit38.lib}"/> <pathelement location="${servletapi.lib}"/> </classpath> - <link href="${jse.doc.link}"/> - <link href="${jee.doc.link}"/> - <link href="${junit.doc.link}"/> <tag name="todo"/> <tag name="revised"/> <tag name="jboss.xmbean"/>
