From 3c3d6db5260f86c902da84b7b34ccf523a764452 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 19 Oct 2023 15:23:29 +0200
Subject: [PATCH] Backport upstream patch to fix Flatpak builds

---
 0001-coverage-use-usercustomize.patch | 19 +++++++++++++++++++
 javapackages-tools.spec               |  8 +++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 0001-coverage-use-usercustomize.patch

diff --git a/0001-coverage-use-usercustomize.patch b/0001-coverage-use-usercustomize.patch
new file mode 100644
index 0000000..be43680
--- /dev/null
+++ b/0001-coverage-use-usercustomize.patch
@@ -0,0 +1,19 @@
+From cd87af9da739da12b0dd4bf104ce4139388c722b Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Mon, 16 Oct 2023 17:56:46 -0400
+Subject: [PATCH] coverage: use usercustomize
+
+Providing sitecustomize clobbers any system-installed module, such as
+that in Fedora's flatpak-runtime-config (which adds the /app prefix).
+---
+ test/coverage/{sitecustomize.py => usercustomize.py} | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename test/coverage/{sitecustomize.py => usercustomize.py} (100%)
+
+diff --git a/test/coverage/sitecustomize.py b/test/coverage/usercustomize.py
+similarity index 100%
+rename from test/coverage/sitecustomize.py
+rename to test/coverage/usercustomize.py
+-- 
+2.41.0
+
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index c396adf..e894ec9 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -16,7 +16,7 @@
 
 Name:           javapackages-tools
 Version:        6.2.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Macros and scripts for Java packaging support
 License:        BSD-3-Clause
 URL:            https://github.com/fedora-java/javapackages
@@ -30,6 +30,8 @@ Source11:       toolchains-openjdk11.xml
 Source17:       toolchains-openjdk17.xml
 Source21:       toolchains-openjdk21.xml
 
+Patch0:         0001-coverage-use-usercustomize.patch
+
 BuildRequires:  coreutils
 BuildRequires:  which
 BuildRequires:  make
@@ -173,6 +175,7 @@ OpenJDK 21 toolchain for XMvn
 
 %prep
 %setup -q -n javapackages-%{version}
+%patch0 -p1
 
 %build
 %configure --pyinterpreter=%{python_interpreter} \
@@ -242,6 +245,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 %license LICENSE
 
 %changelog
+* Thu Oct 19 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.2.0-5
+- Backport upstream patch to fix Flatpak builds
+
 * Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.2.0-4
 - Add support for OpenJDK 21