Accepting request 522908 from Java:packages

Fix build with java 9

OBS-URL: https://build.opensuse.org/request/show/522908
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jython?expand=0&rev=23

jython-compareto.patch

@@ -0,0 +1,14 @@
+--- jython-svn-Release_2_2_1/Lib/test/javatests/AnonInner.java	2006-04-09 18:14:16.000000000 +0200
++++ jython-svn-Release_2_2_1/Lib/test/javatests/AnonInner.java	2017-09-08 11:14:45.116655838 +0200
+@@ -9,11 +9,6 @@
+                 public int hashCode() {
+                     return 2000;
+                 }
+-		//XXX: stuck compareTo to make the compiler happier.
+-		//     hopefully this doesn't mess up the test.
+-		public int compareTo(Object x) {
+-		    return 0;
+-		}
+             };
+         return d.hashCode();
+     }

jython-javadoc.patch

@@ -0,0 +1,10 @@
+--- jython-svn-Release_2_2_1/build.xml	2007-10-13 20:44:01.000000000 +0200
++++ jython-svn-Release_2_2_1/build.xml	2017-09-10 21:20:45.286417750 +0200
+@@ -581,6 +581,7 @@
+                  packagenames="org.python.core, org.python.util, com.ziclix.python.sql"
+                  windowtitle="Jython API documentation"
+                  bottom="<a href='http://www.jython.org' target='_top'>Jython homepage</a>"
++                 additionalparam="-Xdoclint:none"
+         >
+             <classpath refid="main.classpath" />
+         </javadoc>

jython-module.patch

@@ -0,0 +1,11 @@
+--- jython-svn-Release_2_2_1/src/org/python/parser/TreeBuilder.java	2007-06-30 10:57:09.000000000 +0200
++++ jython-svn-Release_2_2_1/src/org/python/parser/TreeBuilder.java	2017-09-08 11:05:27.462211440 +0200
+@@ -111,7 +111,7 @@
+         case JJTSINGLE_INPUT:
+             return new Interactive(makeStmts(arity));
+         case JJTFILE_INPUT:
+-            return new Module(makeStmts(arity));
++            return new org.python.parser.ast.Module(makeStmts(arity));
+         case JJTEVAL_INPUT:
+             return new Expression(makeExpr());
+ 

jython-sourcetarget.patch

@@ -0,0 +1,13 @@
+--- jython-svn-Release_2_2_1/build.xml	2007-10-13 20:44:01.000000000 +0200
++++ jython-svn-Release_2_2_1/build.xml	2017-09-08 11:01:08.947884132 +0200
+@@ -174,8 +174,8 @@
+         <property file="${basedir}/ant.properties" />
+ 
+         <property name="build.compiler" value="modern" />
+-        <property name="jdk.target.version" value="1.4" />
+-        <property name="jdk.source.version" value="1.4" />
++        <property name="jdk.target.version" value="1.6" />
++        <property name="jdk.source.version" value="1.6" />
+         <property name="deprecation" value="off" />
+         <property name="debug" value="off" />
+         <property name="optimize" value="on" />

jython.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sun Sep 10 19:26:18 UTC 2017 - fstrba@suse.com
+
+- Added patches:
+  * jython-compareto.patch
+  * jython-module.patch
+    + Fix build breakages with jdk9
+  * jython-javadoc.patch
+    + Disable doclint in order not to die on javadoc formatting
+      errors
+  * jython-sourcetarget.patch
+    + Specify java target and source level 1.6 in order to allow
+      building with jdk9
+- Depend on jline
+  * Fixes missing symbols with javadoc and jdk9
+
 -------------------------------------------------------------------
 Wed Jun 28 07:21:39 UTC 2017 - tchvatal@suse.com
 

jython.spec

@@ -46,8 +46,13 @@ Patch1:         %{name}-nofullbuildpath.patch
 Patch3:         %{name}-cacheperms.patch
 Patch4:         %{name}-makeCompiledFilename.patch
 Patch5:         %{name}-cached-classes.patch
+Patch6:         %{name}-sourcetarget.patch
+Patch7:         %{name}-module.patch
+Patch8:         %{name}-compareto.patch
+Patch9:         %{name}-javadoc.patch
 Requires:       jakarta-oro
 Requires:       javapackages-tools
+Requires:       jline
 Requires:       libreadline-java >= 0.8.0
 Requires:       python >= %{cpython_version}
 Requires:       servletapi5
@@ -56,6 +61,7 @@ Requires:       java >= 1.6.0
 BuildRequires:  ant
 BuildRequires:  jakarta-oro
 BuildRequires:  java-devel >= 1.6.0
+BuildRequires:  jline
 BuildRequires:  libreadline-java >= 0.8.0
 BuildRequires:  mysql-connector-java
 BuildRequires:  python >= %{cpython_version}
@@ -172,9 +178,13 @@ development and in shipping products.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
-export CLASSPATH=$(build-classpath mysql-connector-java oro servlet)
+export CLASSPATH=$(build-classpath mysql-connector-java oro servlet jline)
 # FIXME: fix jpackage-utils to handle multilib correctly
 export CLASSPATH=$CLASSPATH:%{_libdir}/libreadline-java/libreadline-java.jar