Backport upstream patch to fix Flatpak builds
This commit is contained in:
parent
1e8f04b1ee
commit
3c3d6db526
19
0001-coverage-use-usercustomize.patch
Normal file
19
0001-coverage-use-usercustomize.patch
Normal file
@ -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
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
Name: javapackages-tools
|
Name: javapackages-tools
|
||||||
Version: 6.2.0
|
Version: 6.2.0
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: Macros and scripts for Java packaging support
|
Summary: Macros and scripts for Java packaging support
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
URL: https://github.com/fedora-java/javapackages
|
URL: https://github.com/fedora-java/javapackages
|
||||||
@ -30,6 +30,8 @@ Source11: toolchains-openjdk11.xml
|
|||||||
Source17: toolchains-openjdk17.xml
|
Source17: toolchains-openjdk17.xml
|
||||||
Source21: toolchains-openjdk21.xml
|
Source21: toolchains-openjdk21.xml
|
||||||
|
|
||||||
|
Patch0: 0001-coverage-use-usercustomize.patch
|
||||||
|
|
||||||
BuildRequires: coreutils
|
BuildRequires: coreutils
|
||||||
BuildRequires: which
|
BuildRequires: which
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
@ -173,6 +175,7 @@ OpenJDK 21 toolchain for XMvn
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n javapackages-%{version}
|
%setup -q -n javapackages-%{version}
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --pyinterpreter=%{python_interpreter} \
|
%configure --pyinterpreter=%{python_interpreter} \
|
||||||
@ -242,6 +245,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
|
|||||||
%license LICENSE
|
%license LICENSE
|
||||||
|
|
||||||
%changelog
|
%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
|
* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.2.0-4
|
||||||
- Add support for OpenJDK 21
|
- Add support for OpenJDK 21
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user