Accepting request 530810 from Java:packages

Don't just java-gcj-compat + fix build with jdk9

OBS-URL: https://build.opensuse.org/request/show/530810
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/servletapi5?expand=0&rev=20

java150_build.patch

@@ -1,72 +0,0 @@
-Index: jakarta-tomcat-5.0.18-src/jakarta-servletapi-5/jsr152/build.xml
-===================================================================
---- jakarta-tomcat-5.0.18-src.orig/jakarta-servletapi-5/jsr152/build.xml
-+++ jakarta-tomcat-5.0.18-src/jakarta-servletapi-5/jsr152/build.xml
-@@ -69,6 +69,7 @@
-     <!-- Java classes -->
-     <javac srcdir="src/share" destdir="${jsp-api.build}/classes"
-            debug="${compile.debug}" deprecation="${compile.deprecation}"
-+           source="1.4" target="1.4"
-         optimize="${compile.optimize}"
-        classpath="${servlet-api.jar}" />
- 
-@@ -97,6 +98,7 @@
- 
-     <javadoc packagenames="javax.servlet.jsp.*"
-              sourcepath="${basedir}/src/share"
-+             source="1.4" 
-              classpath="${servlet-api.jar}"
-              destdir="${jsp-api.build}/docs/api"
-              use="true"
-@@ -110,6 +112,7 @@
-   <!-- ======================== Build Examples =========================== -->
-   <target name="ant" depends="prepare">
-     <javac  srcdir="src/ant" destdir="${jsp-api.build}/ant"
-+             source="1.4" target="1.4"
-             debug="${compile.debug}" deprecation="${compile.deprecation}"
-             optimize="${compile.optimize}" 
-             classpath="${ant.home}/lib/ant.jar" />
-@@ -200,6 +203,7 @@
-     </txt2html>
- 
-     <javac   srcdir="examples/WEB-INF/classes" 
-+             source="1.4" target="1.4"
-              destdir="${jsp-api.build}/examples/WEB-INF/classes"
-              debug="${compile.debug}" deprecation="${compile.deprecation}"
-              optimize="${compile.optimize}"
-@@ -208,6 +212,7 @@
-     </javac>
- 
-     <javac   srcdir="examples/plugin/applet" 
-+             source="1.4" target="1.4"
-              destdir="${jsp-api.build}/examples/plugin/applet"
-              debug="${compile.debug}" deprecation="${compile.deprecation}"
-              optimize="${compile.optimize}"
-Index: jakarta-tomcat-5.0.18-src/jakarta-servletapi-5/jsr154/build.xml
-===================================================================
---- jakarta-tomcat-5.0.18-src.orig/jakarta-servletapi-5/jsr154/build.xml
-+++ jakarta-tomcat-5.0.18-src/jakarta-servletapi-5/jsr154/build.xml
-@@ -63,6 +63,7 @@
- 
-     <!-- Java classes -->
-     <javac srcdir="src/share" destdir="${servlet-api.build}/classes"
-+             source="1.4" target="1.4"
-            debug="${compile.debug}" deprecation="${compile.deprecation}"
-         optimize="${compile.optimize}"/>
- 
-@@ -88,6 +89,7 @@
-   <target name="javadoc" depends="prepare" unless="docs.uptodate">
- 
-     <javadoc packagenames="javax.servlet.*"
-+      source="1.4"
-              sourcepath="${basedir}/src/share"
-              destdir="${servlet-api.build}/docs/api"
-              use="true"
-@@ -108,6 +110,7 @@
-     </copy>
- 
-     <javac   srcdir="examples/WEB-INF/classes" 
-+             source="1.4" target="1.4"
-              destdir="${servlet-api.build}/examples/WEB-INF/classes"
-              debug="${compile.debug}" deprecation="${compile.deprecation}"
-              optimize="${compile.optimize}"

servletapi5.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Oct  3 10:43:13 UTC 2017 - fstrba@suse.com
+
+- Removed patch:
+  * java150_build.patch
+    - Don't hardcode the source and target levels, specify them on
+      command line instead
+- Don't build with java-1_5_0-gcj-compat, since it is bound to go
+- Specify source and target level 1.6 in order to allow building
+  with jdk9
+
 -------------------------------------------------------------------
 Mon Jul 21 10:38:49 UTC 2014 - tchvatal@suse.com
 

servletapi5.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package servletapi5
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,11 +26,10 @@ License:        Apache-2.0
 Group:          Development/Libraries/Java
 Url:            http://jakarta.apache.org/tomcat/
 Source:         %{full_name}-5-src.tar.gz
-Patch150:       java150_build.patch
 #!BuildIgnore:  xml-commons xml-commons-resolver xerces-j2 xml-commons-apis
 #!BuildIgnore:  xml-commons-jaxp-1.3-apis
 BuildRequires:  ant
-BuildRequires:  java-1_5_0-gcj-compat-devel
+BuildRequires:  java-devel
 BuildRequires:  xml-commons-apis-bootstrap
 Requires(post): update-alternatives
 Provides:       servlet = %{version}
@@ -45,7 +44,6 @@ of the Java Servlet and JSP APIs (packages javax.servlet).
 
 %prep
 %setup -q -c -T -a 0 -n %{full_name}-5-src
-%patch150
 
 %build
 # Fix us a license file first
@@ -54,11 +52,11 @@ cd jakarta-tomcat-%{version}-src/jakarta-servletapi-5
 find . -type f -name "*.jar" -exec rm -f {} \;
 pushd .
 cd jsr154
-ant jar examples -Dservletapi.build=build -Dservletapi.dist=dist
+ant jar examples -Dservletapi.build=build -Dservletapi.dist=dist -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6
 popd
 pushd .
 cd jsr152
-ant jar examples -Dservletapi.build=build -Dservletapi.dist=dist
+ant jar examples -Dservletapi.build=build -Dservletapi.dist=dist -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6
 popd
 
 %install