Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2018-01-17 21:58:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat" Wed Jan 17 21:58:43 2018 rev:41 rq:566591 version:9.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2017-12-06 08:58:43.452688408 +0100 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.changes 2018-01-17 21:59:40.571375199 +0100 @@ -1,0 +2,9 @@ +Wed Jan 17 09:34:14 UTC 2018 - [email protected] + +- Modified patch: + * tomcat-9.0-javadoc.patch + + Don't append to javadoc --add-modules since we are building + with source=8 + + Avoid accessing Internet URLs from build environment + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.IqFGUp/_old 2018-01-17 21:59:41.475332829 +0100 +++ /var/tmp/diff_new_pack.IqFGUp/_new 2018-01-17 21:59:41.479332642 +0100 @@ -1,7 +1,7 @@ # # spec file for package tomcat # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -17,11 +17,6 @@ # -#Compat macro for new _fillupdir macro introduced in Nov 2017 -%if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates -%endif - %define jspspec 2.3 %define servletspec 4.0 %define elspec 3.0 @@ -40,6 +35,10 @@ %define cachedir %{_localstatedir}/cache/%{name} %define tempdir %{cachedir}/temp %define workdir %{cachedir}/work +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir %{_localstatedir}/adm/fillup-templates +%endif Name: tomcat Version: %{major_version}.%{minor_version}.%{micro_version} Release: 0 @@ -98,7 +97,7 @@ BuildRequires: geronimo-qname-1_1-api BuildRequires: geronimo-saaj-1_1-api BuildRequires: jakarta-taglibs-standard >= 1.1 -BuildRequires: java-devel = 1.8.0 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit @@ -339,7 +338,7 @@ install -d -m 0755 %{buildroot}%{_bindir} install -d -m 0755 %{buildroot}%{_sbindir} install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} -install -d -m 0755 %{buildroot}%{_initrddir} +install -d -m 0755 %{buildroot}%{_initddir} install -d -m 0755 %{buildroot}%{_systemddir} install -d -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d install -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig ++++++ tomcat-9.0-javadoc.patch ++++++ --- /var/tmp/diff_new_pack.IqFGUp/_old 2018-01-17 21:59:41.619326080 +0100 +++ /var/tmp/diff_new_pack.IqFGUp/_new 2018-01-17 21:59:41.623325893 +0100 @@ -61,8 +61,9 @@ encoding="UTF-8" docencoding="UTF-8" charset="UTF-8" +- additionalparam="-breakiterator -notimestamp ${java9.add.modules}" + source="${compile.source}" - additionalparam="-breakiterator -notimestamp ${java9.add.modules}" ++ additionalparam="-breakiterator -notimestamp" maxmemory="512m" failonerror="true" - failonwarning="true"> @@ -70,3 +71,13 @@ <classpath> <path refid="compile.classpath"/> <path refid="tomcat.webservices.classpath"/> +@@ -1868,9 +1873,6 @@ + <link href="../jspapi"/> + <link href="../elapi"/> + <link href="../websocketapi"/> +- <link href="http://docs.oracle.com/javase/8/docs/api/"/> +- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> +- <link href="https://javaee.github.io/javaee-spec/javadocs/"/> + <packageset dir="${tomcat.dist}/src/java/"> + <include name="org/**"/> + <exclude name="org/apache/el/parser/**"/>
