From a4afdc231cb3a0c0bd9342e2965d3d1d81fabda7 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Fri, 13 May 2022 02:10:26 +0000 Subject: [PATCH] Make built packages require JDK 8 or 11 --- SOURCES/javapackages-config.json | 20 ++++++++++++++++++++ SPECS/javapackages-tools.spec | 3 +++ 2 files changed, 23 insertions(+) create mode 100644 SOURCES/javapackages-config.json diff --git a/SOURCES/javapackages-config.json b/SOURCES/javapackages-config.json new file mode 100644 index 0000000..4b82495 --- /dev/null +++ b/SOURCES/javapackages-config.json @@ -0,0 +1,20 @@ +{ + "maven.req": { + "always_generate": [ + "javapackages-filesystem", + "(java-headless or java-11-headless)" + ], + "java_requires": { + "skip": true + }, + "java_devel_requires": { + "skip": true + } + }, + "javadoc.req": { + "always_generate": [ + "javapackages-filesystem" + ] + } +} + diff --git a/SPECS/javapackages-tools.spec b/SPECS/javapackages-tools.spec index 5fce799..04bcba7 100644 --- a/SPECS/javapackages-tools.spec +++ b/SPECS/javapackages-tools.spec @@ -33,6 +33,7 @@ BuildArch: noarch Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz Source1: module-config.xml Source2: toolchains-openjdk8.xml +Source3: javapackages-config.json Patch1: 0001-Move-python-modules-under-java-utils-directory.patch Patch2: 0002-Enable-namespaced-dependency-generation.patch @@ -174,6 +175,8 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 mkdir -p %{buildroot}%{_datadir}/xmvn/conf/ cp -p %{SOURCE2} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml +install -p -m 644 %{SOURCE3} %{buildroot}%{_javaconfdir}/javapackages-config.json + %check ./check