From 10f17bbd3670fbdf3cdc19ed712672b17fe6e455fc15d27aff8ce05d5b4fc54f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 27 Mar 2025 21:22:42 +0000 Subject: [PATCH] Accepting request 1264736 from home:fstrba:maven Fix build with both xmvn-mojo:javadoc and javadoc:aggregate OBS-URL: https://build.opensuse.org/request/show/1264736 OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsonb-api?expand=0&rev=4 --- jsonb-api.changes | 5 +++++ jsonb-api.spec | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/jsonb-api.changes b/jsonb-api.changes index 677448e..2580459 100644 --- a/jsonb-api.changes +++ b/jsonb-api.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 27 21:20:59 UTC 2025 - Fridrich Strba + +- Fix build with both xmvn-mojo:javadoc and javadoc:aggregate + ------------------------------------------------------------------- Sun Sep 8 12:30:33 UTC 2024 - Anton Shvetz diff --git a/jsonb-api.spec b/jsonb-api.spec index 5ed3ae5..a931471 100644 --- a/jsonb-api.spec +++ b/jsonb-api.spec @@ -1,7 +1,7 @@ # # spec file for package jsonb-api # -# Copyright (c) 2024 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 @@ -57,19 +57,21 @@ API documentation for %{name}. %pom_remove_plugin org.glassfish.copyright:glassfish-copyright-maven-plugin api %build -%{mvn_build} -f -- \ - -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \ - -f api +pushd api +%{mvn_build} -f +popd %install +pushd api %mvn_install %fdupes %{buildroot}%{_javadocdir}/%{name} +popd -%files -f .mfiles +%files -f api/.mfiles %license {NOTICE,LICENSE}.md %doc {README,CONTRIBUTING}.md -%files javadoc -f .mfiles-javadoc +%files javadoc -f api/.mfiles-javadoc %license {NOTICE,LICENSE}.md %changelog