Hello community,
here is the log from the commit of package tomcat for openSUSE:Factory checked
in at 2020-01-20 22:56:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tomcat (Old)
and /work/SRC/openSUSE:Factory/.tomcat.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat"
Mon Jan 20 22:56:09 2020 rev:61 rq:765850 version:9.0.30
Changes:
--------
--- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2020-01-18
12:18:53.275163260 +0100
+++ /work/SRC/openSUSE:Factory/.tomcat.new.26092/tomcat.changes 2020-01-20
22:56:17.167362936 +0100
@@ -1,0 +2,15 @@
+Mon Jan 20 13:36:39 UTC 2020 - Fridrich Strba <fst...@suse.com>
+
+- Change back the build to build with any Java >= 1.8
+- Added patch:
+ * tomcat-9.0.30-java8compat.patch
+ + Cast java.nio.ByteBuffer and java.nio.CharBuffer to
+ java.nio.Buffer in order to avoid calling Java 9+ APIs
+ (functions with co-variant return types)
+- Renamed patch:
+ * tomcat-9.0-disable-osgi-build.patch
+ -> tomcat-9.0-osgi-build.patch
+ + Do not disable, but fix OSGi build since we have now
+ aqute-bnd
+
+-------------------------------------------------------------------
Old:
----
tomcat-9.0-disable-osgi-build.patch
New:
----
tomcat-9.0-osgi-build.patch
tomcat-9.0.30-java8compat.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tomcat.spec ++++++
--- /var/tmp/diff_new_pack.10FqFj/_old 2020-01-20 22:56:19.415363800 +0100
+++ /var/tmp/diff_new_pack.10FqFj/_new 2020-01-20 22:56:19.419363802 +0100
@@ -1,7 +1,7 @@
#
# spec file for package tomcat
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2000-2009, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@@ -77,8 +77,10 @@
Patch2:
%{name}-%{major_version}.%{minor_version}-sle.catalina.policy.patch
# PATCH-FIX-OPENSUSE: build javadoc with the same java source level as the
class files
Patch3: %{name}-%{major_version}.%{minor_version}-javadoc.patch
-# PATCH-FIX-OPENSUSE: disable adding OSGi metadata to JAR files because
bndtools is not avalable in SLES/OpenSUSE
-Patch4: tomcat-9.0-disable-osgi-build.patch
+# PATCH-FIX-OPENSUSE: include all necessary aqute-bnd jars
+Patch4: tomcat-9.0-osgi-build.patch
+# PATCH-FIX-OPENSUSE: cast ByteBuffer to Buffer in cases where there is a risk
of using Java 9+ apis
+Patch5: tomcat-9.0.30-java8compat.patch
BuildRequires: ant >= 1.8.1
BuildRequires: ant-antlr
@@ -96,9 +98,8 @@
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
BuildRequires: log4j12
BuildRequires: sed
@@ -256,6 +257,7 @@
%patch2
%patch3 -p1
%patch4 -p1
+%patch5 -p1
# remove date from docs
sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl
++++++ tomcat-9.0-disable-osgi-build.patch -> tomcat-9.0-osgi-build.patch ++++++
++++++ tomcat-9.0.30-java8compat.patch ++++++
++++ 3341 lines (skipped)
