From 919f4f57ddb69cc571d6f00102a2b7a45072a82cdeca62976e060b36b2ce8bce Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 21 Feb 2024 22:05:21 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/guava?expand=0&rev=28 --- guava.changes | 5 +++++ guava.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/guava.changes b/guava.changes index 7082ecd..b0e7de7 100644 --- a/guava.changes +++ b/guava.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 21 22:05:15 UTC 2024 - Fridrich Strba + +- Clean the spec file and simplify it a bit + ------------------------------------------------------------------- Thu Jun 15 13:20:35 UTC 2023 - Fridrich Strba diff --git a/guava.spec b/guava.spec index 8ab71a9..e1050a7 100644 --- a/guava.spec +++ b/guava.spec @@ -1,7 +1,7 @@ # # spec file for package guava # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -91,12 +91,12 @@ install -pm 0644 %{name}-testlib/target/%{name}-testlib-%{version}*.jar %{buildr # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -%mvn_install_pom %{name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%{mvn_install_pom} %{name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar # We integrated this artifact in our main package -%mvn_install_pom futures/failureaccess/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/failureaccess.pom +%{mvn_install_pom} futures/failureaccess/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/failureaccess.pom %add_maven_depmap %{name}/failureaccess.pom %{name}/%{name}.jar -%mvn_install_pom %{name}-testlib/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-testlib.pom +%{mvn_install_pom} %{name}-testlib/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-testlib.pom %add_maven_depmap %{name}/%{name}-testlib.pom %{name}/%{name}-testlib.jar -f %{name}-testlib # javadoc