From 3b43edf1a8aba5ff721d8ed2bd79fe8d68aba7028de747a3f39beed3311f9320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Tue, 25 Feb 2025 19:33:59 +0100
Subject: [PATCH] Sync from SUSE:SLFO:Main plexus-interpolation revision
 967f73092ffc03028b4c15464fbf0e03

---
 plexus-interpolation.changes |  5 +++++
 plexus-interpolation.spec    | 11 +++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plexus-interpolation.changes b/plexus-interpolation.changes
index 57fe07c..7f231c5 100644
--- a/plexus-interpolation.changes
+++ b/plexus-interpolation.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct  2 15:58:55 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Spec file cleanup
+
 -------------------------------------------------------------------
 Thu Jun 13 17:09:48 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/plexus-interpolation.spec b/plexus-interpolation.spec
index 5ecc976..6a4985e 100644
--- a/plexus-interpolation.spec
+++ b/plexus-interpolation.spec
@@ -28,7 +28,7 @@ Source0:        https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{ver
 Source1:        %{name}-build.xml
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildArch:      noarch
 %if %{with tests}
 BuildRequires:  ant-junit
@@ -50,14 +50,9 @@ API documentation for %{name}.
 %prep
 %setup -q -n %{name}-%{name}-%{version}
 cp %{SOURCE1} build.xml
-%pom_remove_plugin :maven-release-plugin
-
-%pom_remove_parent
-
-%pom_xpath_inject "pom:project" "<groupId>org.codehaus.plexus</groupId>"
 
 %build
-%{ant} \
+ant \
 %if %{without tests}
   -Dtest.skip=true \
 %endif
@@ -69,7 +64,7 @@ install -dm 0755 %{buildroot}%{_javadir}/plexus
 install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/interpolation.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/plexus/interpolation.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/plexus/interpolation.pom
 %add_maven_depmap plexus/interpolation.pom plexus/interpolation.jar
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}