From b2af519e1cd1e67ea8d1ad1f53783929cfe0b94216befd6c5409fdc1ccf83e1b Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 19 Sep 2017 09:08:57 +0000
Subject: [PATCH] Fix build with jdk9

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=110
---
 tomcat-8.0.44-javadoc.patch | 42 +++++++++++++++++++++++++++++++++++++
 tomcat.changes              |  9 ++++++++
 tomcat.spec                 | 17 +++++----------
 3 files changed, 56 insertions(+), 12 deletions(-)
 create mode 100644 tomcat-8.0.44-javadoc.patch

diff --git a/tomcat-8.0.44-javadoc.patch b/tomcat-8.0.44-javadoc.patch
new file mode 100644
index 0000000..69f5a34
--- /dev/null
+++ b/tomcat-8.0.44-javadoc.patch
@@ -0,0 +1,42 @@
+--- apache-tomcat-8.0.44-src/build.xml	2017-05-10 19:27:41.000000000 +0200
++++ apache-tomcat-8.0.44-src/build.xml	2017-09-19 11:04:39.650918739 +0200
+@@ -1952,6 +1952,7 @@
+       encoding="UTF-8"
+       docencoding="UTF-8"
+       charset="UTF-8"
++      source="${compile.source}"
+       additionalparam="-breakiterator -notimestamp"
+       maxmemory="512m"
+       failonerror="true">
+@@ -1972,6 +1973,7 @@
+       encoding="UTF-8"
+       docencoding="UTF-8"
+       charset="UTF-8"
++      source="${compile.source}"
+       additionalparam="-breakiterator -notimestamp"
+       maxmemory="512m"
+       failonerror="true">
+@@ -1992,6 +1994,7 @@
+       encoding="UTF-8"
+       docencoding="UTF-8"
+       charset="UTF-8"
++      source="${compile.source}"
+       additionalparam="-breakiterator -notimestamp"
+       maxmemory="512m"
+       failonerror="true">
+@@ -2012,6 +2015,7 @@
+       encoding="UTF-8"
+       docencoding="UTF-8"
+       charset="UTF-8"
++      source="${compile.source}"
+       additionalparam="-breakiterator -notimestamp"
+       maxmemory="512m"
+       failonerror="true">
+@@ -2031,6 +2035,7 @@
+       encoding="UTF-8"
+       docencoding="UTF-8"
+       charset="UTF-8"
++      source="${compile.source}"
+       additionalparam="-breakiterator -notimestamp"
+       maxmemory="512m"
+       failonerror="true">
diff --git a/tomcat.changes b/tomcat.changes
index a885ec4..32f35b9 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Sep 19 09:07:39 UTC 2017 - fstrba@suse.com
+
+- Added patch:
+  * tomcat-8.0.44-javadoc.patch
+    - generate documentation with the same source level as class
+      files
+	- fixes build with jdk9
+
 -------------------------------------------------------------------
 Fri Jun  9 05:44:53 UTC 2017 - ecsos@opensuse.org
 
diff --git a/tomcat.spec b/tomcat.spec
index f1d47a8..c9c5d3c 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -77,7 +77,8 @@ Patch2:         tomcat-8.0.9-property-build.windows.patch
 Patch3:         tomcat-8.0.33-JDTCompiler-java.patch
 # PATCH-FIX-SLE: Change security manager default policies bnc#891264
 Patch4:         tomcat-8.0-sle.catalina.policy.patch
-
+# PATCH-FIX-OPENSUSE: build javadoc with the same java source level as the class files
+Patch5:         tomcat-8.0.44-javadoc.patch
 BuildRequires:  ant >= 1.8.1
 BuildRequires:  ant-antlr
 BuildRequires:  apache-commons-collections
@@ -114,7 +115,6 @@ Requires(pre):  %{_sbindir}/groupadd
 Requires(pre):  %{_sbindir}/useradd
 Recommends:     libtcnative-1-0 >= 1.1.24
 Recommends:     logrotate
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 %systemd_requires
 
@@ -247,6 +247,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 %patch2 -p1
 %patch3
 %patch4
+%patch5 -p1
 
 # remove date from docs
 sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl
@@ -471,7 +472,7 @@ pushd %{buildroot}%{appdir}/examples/META-INF
 echo '<?xml version="1.0" encoding="UTF-8"?>'>context.xml
 echo '<Context>'>>context.xml
 echo '  <Resources allowLinking="true" />'>>context.xml
-echo '</Context>'>>context.xml                         
+echo '</Context>'>>context.xml
 popd
 
 pushd %{buildroot}%{appdir}/examples/WEB-INF/lib
@@ -699,16 +700,13 @@ rm -f \
 %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
 
 %files admin-webapps
-%defattr(0644,root,root,0755)
 %{appdir}/host-manager
 %{appdir}/manager
 
 %files docs-webapp
-%defattr(-,root,root)
 %doc %{appdir}/docs
 
 %files el-3_0-api
-%defattr(-,root,root)
 %{_javadir}/%{name}-el-%{elspec}-api.jar
 %{_javadir}/%{name}-el-api.jar
 %{libdir}/%{name}-el-%{elspec}-api.jar
@@ -724,11 +722,9 @@ rm -f \
 %ghost %{_sysconfdir}/alternatives/el_api.jar
 
 %files javadoc
-%defattr(-,root,root)
 %doc %{_javadocdir}/%{name}
 
 %files jsp-2_3-api
-%defattr(0644,root,root,0755)
 %{_javadir}/%{name}-jsp-%{jspspec}-api.jar
 %{_javadir}/%{name}-jsp-api.jar
 %{_javadir}/jsp.jar
@@ -739,8 +735,8 @@ rm -f \
 %else
 %{_datadir}/maven-metadata/%{name}-tomcat-jsp-api.xml
 %endif
+
 %files lib
-%defattr(-,root,root)
 %{libdir}
 %dir %{bindir}
 %{bindir}/tomcat-juli.jar
@@ -768,7 +764,6 @@ rm -f \
 %config(noreplace) %{_sysconfdir}/ant.d/catalina-ant
 
 %files embed
-%defattr(-,root,root)
 %dir %{libdir}
 %{libdir}/%{name}*-embed-*.jar
 %{_mavenpomdir}/JPP.%{name}-tomcat-embed-websocket.pom
@@ -778,7 +773,6 @@ rm -f \
 %{_mavenpomdir}/JPP.%{name}-tomcat-embed-logging-juli.pom
 
 %files servlet-3_1-api
-%defattr(-,root,root)
 %doc LICENSE
 %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
 %{_javadir}/%{name}-servlet-api.jar
@@ -792,7 +786,6 @@ rm -f \
 %{_mavenpomdir}/JPP-%{name}-servlet-api.pom
 
 %files webapps
-%defattr(-,root,root)
 #bnc#520532
 %config(noreplace) %{appdir}/ROOT
 %{appdir}/examples