From bce8682351c85fc3c70288102b4b10b21bfe1c9fd25cab5f75138151c7c5565a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 17 Oct 2023 05:19:46 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=278 --- tomcat.changes | 5 ----- tomcat.spec | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tomcat.changes b/tomcat.changes index 411b2d7..7c78887 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Oct 16 23:40:29 UTC 2023 - Fridrich Strba - -- Build against axis jaxrpc, since geronimo-jaxrpc apis are gone - ------------------------------------------------------------------- Fri Oct 13 11:12:07 UTC 2023 - Fridrich Strba diff --git a/tomcat.spec b/tomcat.spec index 22e3dbe..562d04f 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -91,11 +91,11 @@ BuildRequires: apache-commons-dbcp >= 2.0 BuildRequires: apache-commons-pool2 BuildRequires: aqute-bnd >= 5.2 BuildRequires: aqute-bndlib >= 5.2 -BuildRequires: axis BuildRequires: ecj >= 4.4.0 BuildRequires: fdupes BuildRequires: findutils BuildRequires: geronimo-jaf-1_0_2-api +BuildRequires: geronimo-jaxrpc-1_1-api BuildRequires: geronimo-qname-1_1-api BuildRequires: geronimo-saaj-1_1-api BuildRequires: jakarta-taglibs-standard >= 1.1 @@ -287,7 +287,7 @@ ant -Dbase.path="." \ -Dtomcat-native.home="." \ -Dcommons-daemon.native.win.mgr.exe="HACK" \ -Dnsis.exe="HACK" \ - -Djaxrpc-lib.jar="$(build-classpath axis/jaxrpc)" \ + -Djaxrpc-lib.jar="$(build-classpath geronimo-jaxrpc-1.1-api)" \ -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)" \