Accepting request 1148114 from Java:packages

rpm 4.20 compat

OBS-URL: https://build.opensuse.org/request/show/1148114
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-containers?expand=0&rev=12

plexus-component-metadata.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 20 14:46:35 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Sun Mar 20 17:45:24 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

plexus-component-metadata.spec

@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package plexus-component-metadata
 #
-# Copyright (c) 2023 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

plexus-containers.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 20 14:46:18 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Thu May  4 12:06:52 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
 

plexus-containers.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package plexus-containers
 #
-# Copyright (c) 2023 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
@@ -63,12 +63,6 @@ Group:          Development/Libraries/Java
 %package container-default
 Summary:        Default Container from %{name}
 Group:          Development/Libraries/Java
-Requires:       mvn(com.google.guava:guava)
-Requires:       mvn(org.apache.xbean:xbean-reflect)
-Requires:       mvn(org.codehaus.plexus:plexus-classworlds)
-Requires:       mvn(org.codehaus.plexus:plexus-utils)
-Requires:       mvn(org.ow2.asm:asm)
-Requires:       mvn(org.ow2.asm:asm-commons)
 
 %description container-default
 %{summary}.
@@ -128,9 +122,7 @@ mkdir -p plexus-component-annotations/src/test/java
 %build
 for i in plexus-component-annotations plexus-container-default; do
   pushd ${i}
-  	%pom_remove_parent .
+    %{ant} \
-	%pom_xpath_inject "pom:project" "<groupId>org.codehaus.plexus</groupId><version>%{version}</version>" .
-    ant \
 %if %{without tests}
       -Dtest.skip=true \
 %endif
@@ -151,7 +143,7 @@ ln -sf ../%{name}/plexus-component-annotations.jar %{buildroot}%{_javadir}/plexu
 # poms
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
 for i in plexus-component-annotations plexus-container-default; do
-  install -pm 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
+  %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
 done
 %add_maven_depmap %{name}/plexus-component-annotations.pom %{name}/plexus-component-annotations.jar -f component-annotations
 %add_maven_depmap %{name}/plexus-container-default.pom %{name}/plexus-container-default.jar -f container-default -a org.codehaus.plexus:containers-component-api

plexus-metadata-generator.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 20 14:45:18 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Fri May 20 12:13:42 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

plexus-metadata-generator.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package plexus-metadata-generator
 #
-# Copyright (c) 2023 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
@@ -88,9 +88,9 @@ build-jar-repository -s lib %{base_name} objectweb-asm/asm objectweb-asm/asm-com
 build-jar-repository -s lib hamcrest/core xbean/xbean-reflect
 %endif
 
-%patch1 -p1
+%patch -P 1 -p1
 
-%patch1000 -p1
+%patch -P 1000 -p1
 
 cp %{SOURCE1} .
 cp %{SOURCE2} .
@@ -135,11 +135,6 @@ rm -rf plexus-%{comp_name}/src/main/resources/META-INF/maven
 %pom_remove_dep :maven-model plexus-%{comp_name}
 %pom_remove_dep :maven-plugin-api plexus-%{comp_name}
 
-%pom_remove_parent plexus-%{comp_name}
-%pom_xpath_inject "pom:project" "
-  <groupId>org.codehaus.plexus</groupId>
-  <version>%{version}</version>
-" plexus-%{comp_name}
 %pom_xpath_set "pom:project/pom:artifactId" %{name} plexus-%{comp_name}
 
 %build
@@ -158,7 +153,7 @@ install -dm 0755 %{buildroot}%{_javadir}
 install -pm 0644 plexus-%{comp_name}/target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}
-install -pm 0644 plexus-%{comp_name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%{mvn_install_pom} plexus-%{comp_name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
 %add_maven_depmap %{name}.pom %{name}.jar
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}