From 37b2e8400031c04fb360ed38042fd1b03dd97387 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 16 Jan 2025 11:15:01 +0100 Subject: [PATCH] Define java_home macro Resolves: RHEL-74245 --- javapackages-bootstrap.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index fe8a5b5..28352bd 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -1,6 +1,6 @@ # Exclude automatically generated requires on java interpreter which is not # owned by any package -%global __requires_exclude ^%{_jvmdir}/java +%global __requires_exclude ^%{_jvmdir}/jre # Don't run OSGi dependency generators on private (bundled) JARs %global __requires_exclude_from \\.jar$ @@ -12,7 +12,7 @@ %global debug_package %{nil} -%global javaHomePath %{_jvmdir}/java-21-openjdk +%global javaHomePath %{_jvmdir}/jre-21-openjdk %global mavenHomePath %{_datadir}/%{name} %global metadataPath %{mavenHomePath}/maven-metadata %global artifactsPath %{_prefix}/lib @@ -23,7 +23,7 @@ Name: javapackages-bootstrap Version: 1.17.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING License: Apache-1.1 AND Apache-2.0 AND (Apache-2.0 OR EPL-2.0) AND (Apache-2.0 OR LGPL-2.0-or-later) AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND CPL-1.0 AND EPL-1.0 AND EPL-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND LicenseRef-Fedora-Public-Domain AND MIT AND Plexus AND SMLNJ AND Saxpath AND xpp @@ -249,6 +249,7 @@ echo ' %%__xmvngen_requires_generators %%{nil} %%__xmvngen_post_install_hooks org.fedoraproject.xmvn.generator.transformer.TransformerHookFactory %%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH +%%java_home %{javaHomePath} ' >%{buildroot}%{_rpmmacrodir}/macros.jpbgen sed -i s/xmvn-generator/%{name}-generator/ %{buildroot}%{_sysconfdir}/rpm/macros.jpbgenhook @@ -273,6 +274,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Thu Jan 16 2025 Mikolaj Izdebski - 1.17.0-3 +- Define java_home macro + * Thu Aug 01 2024 Troy Dawson - 1.17.0-2 - Bump release for Aug 2024 java mass rebuild