From b9c7b48bf777f212f614d094b00e2a063892790f Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sun, 21 Nov 2021 11:22:35 +0100
Subject: [PATCH] Uptate ivy-local classpath

Resolves: rhbz#2025272
---
 0001-Update-ivy-local-classpath.patch | 21 +++++++++++++++++++++
 javapackages-tools.spec               |  9 ++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 0001-Update-ivy-local-classpath.patch

diff --git a/0001-Update-ivy-local-classpath.patch b/0001-Update-ivy-local-classpath.patch
new file mode 100644
index 0000000..1198de0
--- /dev/null
+++ b/0001-Update-ivy-local-classpath.patch
@@ -0,0 +1,21 @@
+From ea8e50b737a8b8210417af767df50f6299d94d23 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Sun, 21 Nov 2021 11:19:41 +0100
+Subject: [PATCH] Update ivy-local-classpath
+
+---
+ configs/ivy-local-classpath | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configs/ivy-local-classpath b/configs/ivy-local-classpath
+index 9ab48d25..d65d6358 100644
+--- a/configs/ivy-local-classpath
++++ b/configs/ivy-local-classpath
+@@ -1,3 +1,3 @@
+-xmvn/xmvn-connector-ivy
++xmvn-connector-ivy/xmvn-connector-ivy
+ xmvn/xmvn-launcher
+ xmvn/xmvn-api
+-- 
+2.33.1
+
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 985c97c..2877e97 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -18,7 +18,7 @@
 
 Name:           javapackages-tools
 Version:        6.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Macros and scripts for Java packaging support
 License:        BSD
 URL:            https://github.com/fedora-java/javapackages
@@ -31,6 +31,9 @@ Source8:        toolchains-openjdk8.xml
 Source11:       toolchains-openjdk11.xml
 Source17:       toolchains-openjdk17.xml
 
+# Upstream patch for rhbz#2025272
+Patch0:         0001-Update-ivy-local-classpath.patch
+
 BuildRequires:  coreutils
 BuildRequires:  which
 BuildRequires:  make
@@ -159,6 +162,7 @@ OpenJDK 17 toolchain for XMvn
 
 %prep
 %setup -q -n javapackages-%{version}
+%patch0 -p1
 
 sed -i '/^manpage /d' build
 sed -i '/${mandir}/d' install
@@ -224,6 +228,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 %license LICENSE
 
 %changelog
+* Sun Nov 21 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-4
+- Uptate ivy-local classpath
+
 * Wed Nov 17 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 6.0.0-3
 - Re-add ivy-local subpackage