diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 6d33726..3be681b 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -17,7 +17,7 @@ Name: javapackages-bootstrap Version: 1.5.0^20220505.git%{git_short_hash} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING License: ASL 2.0 and ASL 1.1 and (ASL 2.0 or EPL-2.0) and (EPL-2.0 or GPLv2 with exceptions) and MIT and BSD with advertising and BSD and EPL-1.0 and EPL-2.0 and CDDL-1.0 and xpp and CC0 and Public Domain @@ -333,7 +333,7 @@ do done # Use toolchains.xml provided by javapackages-tools -ln -sf %{_datadir}/xmvn/conf/toolchains.xml %{buildroot}%{mavenHomePath}/conf/toolchains.xml +rm %{buildroot}%{mavenHomePath}/conf/toolchains.xml install -d -m 755 %{buildroot}%{_rpmmacrodir} echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_rpmmacrodir}/macros.%{name} @@ -353,6 +353,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %doc AUTHORS %changelog +* Thu May 05 2022 Mikolaj Izdebski - 1.5.0^20220505.git4f9a68a-2 +- Fix dangling toolchains.xml symlink + * Thu May 05 2022 Mikolaj Izdebski - 1.5.0^20220505.git4f9a68a-1 - Update to latest upstream snapshot