From fbe039477add12b7228212c4e03a73bcf58fb2fdcfd04bd83a7310de21bbe3ed Mon Sep 17 00:00:00 2001 From: Fridrich Strba <fstrba@suse.com> Date: Tue, 11 May 2021 06:53:47 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/guava?expand=0&rev=12 --- guava.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/guava.spec b/guava.spec index ecc530e..8d434b7 100644 --- a/guava.spec +++ b/guava.spec @@ -120,7 +120,10 @@ install -pm 0644 %{name}-testlib/target/%{name}-testlib-%{version}*.jar %{buildr # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} install -pm 0644 %{name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom -%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar -f %{name} +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar +# We integrated this artifact in our main package +install -pm 0644 futures/failureaccess/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/failureaccess.pom +%add_maven_depmap %{name}/failureaccess.pom %{name}/%{name}.jar install -pm 0644 %{name}-testlib/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-testlib.pom %add_maven_depmap %{name}/%{name}-testlib.pom %{name}/%{name}-testlib.jar -f %{name}-testlib @@ -130,7 +133,7 @@ cp -r %{name}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/%{name} cp -r %{name}-testlib/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/%{name}-testlib %fdupes -s %{buildroot}%{_javadocdir} -%files -f .mfiles-guava +%files -f .mfiles %doc CONTRIBUTORS README* %license COPYING