From 3b010030eda2eba74d9dc3fa833789a43914f26152c01737c4c78f197c6db9e9 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 20 Feb 2024 14:57:44 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/plexus-i18n?expand=0&rev=10

---
 plexus-i18n.changes |  5 +++++
 plexus-i18n.spec    | 27 ++++++++++++++-------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/plexus-i18n.changes b/plexus-i18n.changes
index d8fab34..b3f661c 100644
--- a/plexus-i18n.changes
+++ b/plexus-i18n.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 20 14:55:35 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Sun Mar 20 18:02:02 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/plexus-i18n.spec b/plexus-i18n.spec
index 0670aaf..e6b0dbb 100644
--- a/plexus-i18n.spec
+++ b/plexus-i18n.spec
@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package plexus-i18n
 #
-# 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
@@ -37,12 +37,10 @@ Patch0:         %{name}-migration-to-component-metadata.patch
 Patch1:         %{name}-plexus-container-default-missing.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  plexus-containers-container-default
 BuildRequires:  plexus-metadata-generator
 BuildRequires:  plexus-utils
-Requires:       mvn(org.codehaus.plexus:plexus-container-default)
-Requires:       mvn(org.codehaus.plexus:plexus-utils)
 BuildArch:      noarch
 %if %{with tests}
 BuildRequires:  ant-junit
@@ -68,18 +66,21 @@ Javadoc for %{name}.
 %prep
 %setup -q -n %{name}-%{namedver}
 cp %{SOURCE1} build.xml
-%patch0 -p1
-%patch1 -p1
-
-%pom_remove_parent .
-%pom_xpath_inject pom:project "<groupId>org.codehaus.plexus</groupId>" .
+%patch -P 0 -p1
+%patch -P 1 -p1
 
 %build
 mkdir -p lib
-build-jar-repository -s lib plexus/utils plexus-containers/plexus-container-default
+build-jar-repository -s lib \
+    plexus/utils \
+    plexus-containers/plexus-container-default
 %if %{with tests}
-build-jar-repository -s lib guava/guava xbean/xbean-reflect plexus/classworlds
+build-jar-repository -s lib \
+    guava/guava \
+    xbean/xbean-reflect \
+    plexus/classworlds
 %endif
+
 %{ant} \
 %if %{without tests}
   -Dtest.skip=true \
@@ -92,7 +93,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{name}
 install -pm 0644 target/%{name}-%{namedver}.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}