From afe020b8309b6b14f9d260bb7db322b8b6b71b42167aaf0780bf11278aef4cd0 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 17 Feb 2024 11:06:14 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat10?expand=0&rev=34 --- tomcat10.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tomcat10.spec b/tomcat10.spec index 52cd58b..979fa10 100644 --- a/tomcat10.spec +++ b/tomcat10.spec @@ -438,8 +438,8 @@ pushd %{buildroot}%{_javadir} popd pushd output/build - %{_bindir}/build-jar-repository lib commons-collections \ - commons-dbcp2 commons-pool2 ecj/ecj 2>&1 + %{_bindir}/build-jar-repository -s lib commons-collections \ + commons-dbcp2 commons-pool2 ecj/ecj 2>&1 # need to use -p here with b-j-r otherwise the examples webapp fails to # load with a java.io.IOException %{_bindir}/build-jar-repository -p webapps/examples/WEB-INF/lib \ @@ -455,6 +455,8 @@ pushd %{buildroot}%{libdir} rm -f commons-dbcp.jar ln -s $(build-classpath commons-dbcp2) commons-dbcp2.jar ln -s $(build-classpath commons-pool2) commons-pool2.jar + rm ecj.jar + ln -s $(build-classpath ecj/ecj) ecj.jar ln -s $(build-classpath ecj/ecj) jasper-jdt.jar # Temporary copy the juli jar here from %%{_datadir}/java/tomcat (for maven depmap) From ba67310bd65fbaa80068da84a49694e369ff2ef7c517e73f99c8a9deefce39f7 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 17 Feb 2024 14:56:16 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat10?expand=0&rev=35 --- tomcat10.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tomcat10.changes b/tomcat10.changes index df7bb8f..ab64cbe 100644 --- a/tomcat10.changes +++ b/tomcat10.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 17 14:55:36 UTC 2024 - Fridrich Strba + +- Link ecj.jar into the install instead of copying it + ------------------------------------------------------------------- Tue Feb 6 10:04:21 UTC 2024 - Michele Bussolotto