Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package tomcat for openSUSE:Factory checked
in at 2023-09-20 13:25:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tomcat (Old)
and /work/SRC/openSUSE:Factory/.tomcat.new.16627 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat"
Wed Sep 20 13:25:59 2023 rev:95 rq:1111850 version:9.0.75
Changes:
--------
--- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2023-09-14
16:28:14.516104189 +0200
+++ /work/SRC/openSUSE:Factory/.tomcat.new.16627/tomcat.changes 2023-09-20
13:27:50.175736354 +0200
@@ -1,0 +2,9 @@
+Mon Sep 18 06:03:34 UTC 2023 - Fridrich Strba <fst...@suse.com>
+
+- Modified patch:
+ * tomcat-9.0-osgi-build.patch
+ + make it more robust to change in number of artifacts in bnd
+ + do not enumerate jars, just take all jars from the aqute-bnd
+ directory into the classpath
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tomcat.spec ++++++
--- /var/tmp/diff_new_pack.k4yH3O/_old 2023-09-20 13:27:52.999837529 +0200
+++ /var/tmp/diff_new_pack.k4yH3O/_new 2023-09-20 13:27:52.999837529 +0200
@@ -291,10 +291,7 @@
-Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \
-Dsaaj-api.jar="$(build-classpath geronimo-saaj-1.1-api)" \
-Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \
- -Dbndant.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.ant)" \
- -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \
- -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \
- -Dbndannotation.jar="$(build-classpath
aqute-bnd/biz.aQute.bnd.annotation)" \
+ -Dbnd.dir="%{_javadir}/aqute-bnd" \
-Dosgiannotation.jar="$(build-classpath osgi-annotation/osgi.annotation)" \
-Dosgi-annotations.jar="$(build-classpath
aqute-bnd/biz.aQute.bnd.annotation)" \
-Dosgicmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \
++++++ tomcat-9.0-osgi-build.patch ++++++
--- /var/tmp/diff_new_pack.k4yH3O/_old 2023-09-20 13:27:53.095840968 +0200
+++ /var/tmp/diff_new_pack.k4yH3O/_new 2023-09-20 13:27:53.095840968 +0200
@@ -12,14 +12,13 @@
</path>
<path id="tomcat.classpath">
-@@ -3845,6 +3845,13 @@
+@@ -3845,6 +3845,12 @@
<!-- Add bnd tasks to project -->
<path id="bnd.classpath">
<fileset file="${bnd.jar}" />
-+ <fileset file="${bndant.jar}" />
-+ <fileset file="${bndlib.jar}" />
-+ <fileset file="${bndlibg.jar}" />
-+ <fileset file="${bndannotation.jar}" />
++ <fileset dir="${bnd.dir}">
++ <include name="**/*.jar"/>
++ </fileset>
+ <fileset file="${osgiannotation.jar}" />
+ <fileset file="${osgicmpn.jar}" />
+ <fileset file="${slf4j-api.jar}" />
