From 93d2c1430e39f0a6cc4a6316b76113d762539257632a2e9e1d564be3331d4641 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 21 Feb 2024 14:56:29 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-invoker?expand=0&rev=22 --- maven-invoker.changes | 5 +++++ maven-invoker.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/maven-invoker.changes b/maven-invoker.changes index e1cfacd..3454fb4 100644 --- a/maven-invoker.changes +++ b/maven-invoker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 21 14:55:53 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Mon Apr 25 18:38:03 UTC 2022 - Fridrich Strba diff --git a/maven-invoker.spec b/maven-invoker.spec index 0d12494..4d59860 100644 --- a/maven-invoker.spec +++ b/maven-invoker.spec @@ -1,7 +1,7 @@ # # spec file for package maven-invoker # -# Copyright (c) 2022 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 @@ -30,7 +30,7 @@ Patch1: %{name}-MSHARED-279.patch BuildRequires: ant BuildRequires: atinject BuildRequires: fdupes -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: maven-shared-utils >= 3.3.3 BuildRequires: sisu-inject BuildRequires: unzip @@ -60,7 +60,7 @@ API documentation for %{name}. %setup -q sed -i 's/\r$//' src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java cp %{SOURCE1} build.xml -%patch1 -p1 +%patch -P 1 -p1 %pom_change_dep javax.inject:javax.inject:1 org.eclipse.sisu:org.eclipse.sisu.inject %pom_remove_parent . @@ -77,7 +77,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{name} install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name}