From f255bd12341a12e6c94cfad33c651330c2da73da1ff50fad9248523d78980c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Fri, 10 Oct 2025 22:35:58 +0200
Subject: [PATCH] Sync with maven4

---
 plexus-xml4.spec | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/plexus-xml4.spec b/plexus-xml4.spec
index 6d31620..01ac2fd 100644
--- a/plexus-xml4.spec
+++ b/plexus-xml4.spec
@@ -17,7 +17,8 @@
 
 
 %global base_name plexus-xml
-Name:           %{base_name}4
+%global version_suffix 4
+Name:           %{base_name}%{version_suffix}
 Version:        4.0.4
 Release:        0
 Summary:        Plexus XML Utilities
@@ -53,19 +54,19 @@ cp -p %{SOURCE1} build.xml
 %build
 mkdir -p lib
 build-jar-repository -s lib \
-  maven4/maven-api-xml \
-  maven4/maven-xml
+  maven/maven-api-xml \
+  maven/maven-xml
 %{ant} \
   jar javadoc
 
 %install
 # jar
-install -dm 0755 %{buildroot}%{_javadir}/%{name}
-install -pm 0644 target/%{base_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{base_name}.jar
+install -dm 0755 %{buildroot}%{_javadir}/plexus
+install -pm 0644 target/%{base_name}-%{version}.jar %{buildroot}%{_javadir}/plexus/xml.jar
 # pom
-install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
-%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{base_name}.pom
-%add_maven_depmap %{name}/%{base_name}.pom %{name}/%{base_name}.jar -v %{version}
+install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/plexus/xml.pom
+%add_maven_depmap plexus/xml.pom plexus/xml.jar -v %{version_suffix}
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/