From 6bfbbfc09ad82861024f86729202631515c9c37df07ab83a21a87ce2a25f8d4b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 10 Apr 2024 14:31:34 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-languages?expand=0&rev=20 --- plexus-languages.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index ecc1387..435b640 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -31,7 +31,7 @@ BuildRequires: ant BuildRequires: atinject BuildRequires: fdupes BuildRequires: java-devel >= 9 -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: objectweb-asm BuildRequires: plexus-containers-component-annotations BuildRequires: qdox >= 2 @@ -74,9 +74,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{name} install -pm 0644 plexus-java/target/plexus-java-%{version}.jar %{buildroot}%{_javadir}/%{name}/plexus-java.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom -%add_maven_depmap %{name}/%{name}.pom -install -pm 0644 plexus-java/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/plexus-java.pom +%{mvn_install_pom} plexus-java/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/plexus-java.pom %add_maven_depmap %{name}/plexus-java.pom %{name}/plexus-java.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/plexus-java