Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2017-09-20 17:11:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat" Wed Sep 20 17:11:27 2017 rev:39 rq:527265 version:8.0.44 Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2017-06-24 08:34:59.931768737 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.changes 2017-09-20 17:11:29.235721825 +0200 @@ -1,0 +2,9 @@ +Tue Sep 19 09:07:39 UTC 2017 - [email protected] + +- Added patch: + * tomcat-8.0.44-javadoc.patch + - generate documentation with the same source level as class + files + - fixes build with jdk9 + +------------------------------------------------------------------- New: ---- tomcat-8.0.44-javadoc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.VmjVaM/_old 2017-09-20 17:11:31.203444830 +0200 +++ /var/tmp/diff_new_pack.VmjVaM/_new 2017-09-20 17:11:31.203444830 +0200 @@ -77,7 +77,8 @@ 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}/useradd Recommends: libtcnative-1-0 >= 1.1.24 Recommends: logrotate -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %systemd_requires @@ -247,6 +247,7 @@ %patch2 -p1 %patch3 %patch4 +%patch5 -p1 # remove date from docs sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl @@ -699,16 +700,13 @@ %{_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 @@ %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 @@ %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 @@ %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 @@ %{_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 @@ %{_mavenpomdir}/JPP-%{name}-servlet-api.pom %files webapps -%defattr(-,root,root) #bnc#520532 %config(noreplace) %{appdir}/ROOT %{appdir}/examples ++++++ tomcat-8.0.44-javadoc.patch ++++++ --- 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">
