From d7d5c718d037e19b737eb53d5020ec4b069ef8ad2c82a62c44cf4fb042b63e67 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 10 Nov 2021 06:56:56 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=227

---
 tomcat-9.0-osgi-build.patch | 3 ++-
 tomcat.changes              | 7 +++++++
 tomcat.spec                 | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/tomcat-9.0-osgi-build.patch b/tomcat-9.0-osgi-build.patch
index 0fec32a..1f2826c 100644
--- a/tomcat-9.0-osgi-build.patch
+++ b/tomcat-9.0-osgi-build.patch
@@ -2,10 +2,11 @@ Index: apache-tomcat-9.0.37-src/build.xml
 ===================================================================
 --- apache-tomcat-9.0.37-src.orig/build.xml
 +++ apache-tomcat-9.0.37-src/build.xml
-@@ -3307,6 +3307,12 @@ Read the Building page on the Apache Tom
+@@ -3307,6 +3307,13 @@ Read the Building page on the Apache Tom
      <!-- 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}" />
diff --git a/tomcat.changes b/tomcat.changes
index 73eac81..937bee9 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov 10 06:51:24 UTC 2021 - Fridrich Strba <fstrba@suse.com>
+
+- Modified patch:
+  * tomcat-9.0-osgi-build.patch
+    + account for biz.aQute.bnd.ant artifact in aqute-bnd >= 5.2.0
+
 -------------------------------------------------------------------
 Mon Oct 18 21:42:48 UTC 2021 - Marcel Witte <wittemar@googlemail.com>
 
diff --git a/tomcat.spec b/tomcat.spec
index ed72c74..81219fa 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -293,6 +293,7 @@ ant -Dbase.path="." \
     -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)" \