diff --git a/java-scriptengine.changes b/java-scriptengine.changes index fa61f7b..163c20e 100644 --- a/java-scriptengine.changes +++ b/java-scriptengine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 27 18:32:36 UTC 2025 - Fridrich Strba + +- Fix build with both xmvn-mojo:javadoc and javadoc:aggregate + ------------------------------------------------------------------- Fri Dec 16 01:36:24 UTC 2022 - Anton Shvetz diff --git a/java-scriptengine.spec b/java-scriptengine.spec index d6da1d9..1b59bee 100644 --- a/java-scriptengine.spec +++ b/java-scriptengine.spec @@ -1,7 +1,7 @@ # # spec file for package java-scriptengine # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,7 @@ License: MIT Group: Development/Libraries/Java URL: https://github.com/eobermuhlner/%{name} Source0: %{url}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +BuildRequires: fdupes BuildRequires: maven-local BuildArch: noarch @@ -61,16 +62,21 @@ mv pom.xml ch.obermuhlner.scriptengine.java %{mvn_file} : %{name} %build -%{mvn_build} -f -- -Dmaven.compiler.{source,target}=8 -f ch.obermuhlner.scriptengine.java +pushd ch.obermuhlner.scriptengine.java +%{mvn_build} -f -- -Dmaven.compiler.{source,target}=8 +popd %install +pushd ch.obermuhlner.scriptengine.java %mvn_install +%fdupes %{buildroot}%{_javadocdir}/%{name} +popd -%files -f .mfiles +%files -f ch.obermuhlner.scriptengine.java/.mfiles %license LICENSE.txt %doc README.md docs/releases/v*.md -%files javadoc -f .mfiles-javadoc +%files javadoc -f ch.obermuhlner.scriptengine.java/.mfiles-javadoc %license LICENSE.txt %changelog