Accepting request 1264758 from Java:packages

OBS-URL: https://build.opensuse.org/request/show/1264758
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/simpleframework?expand=0&rev=2

simpleframework.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar 27 21:38:11 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Fix build with both xmvn-mojo:javadoc and javadoc:aggregate
+
 -------------------------------------------------------------------
 Fri Feb  3 00:29:17 UTC 2023 - Anton Shvetz <shvetz.anton@gmail.com>
 

simpleframework.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package simpleframework
 #
-# 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
@@ -25,6 +25,7 @@ Group:          Development/Libraries/Java
 URL:            https://github.com/ngallagher/%{name}
 Source0:        %{url}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
+BuildRequires:  fdupes
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.maven.wagon:wagon-ssh-external)
 BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
@@ -62,16 +63,21 @@ sed -i -e 's/\r//g' README.md
 %pom_remove_plugin -r :maven-javadoc-plugin simple
 
 %build
-%{mvn_build} -f -- -Dsource=8 -f simple
+pushd simple
+%{mvn_build} -f -- -Dsource=8
+popd
 
 %install
+pushd simple
 %mvn_install
+%fdupes %{buildroot}%{_javadocdir}/%{name}
+popd
 
-%files -f .mfiles
+%files -f simple/.mfiles
 %license LICENSE-2.0.txt
 %doc README.md
 
-%files javadoc -f .mfiles-javadoc
+%files javadoc -f simple/.mfiles-javadoc
 %license LICENSE-2.0.txt
 
 %changelog