[rpms/plexus-i18n] epel10: Remove patches and use pom_* macros instead

[rpms/plexus-i18n] epel10: Remove patches and use pom_* macros instead

[Didik Supriadi]

A new commit has been pushed.

Repo   : rpms/plexus-i18n
Branch : epel10
Commit : c1de82058115cc9b8c8f6d1dedf4f601b0a1a365
Author : Didik Supriadi <didiksupriadi41@fedoraproject.org>
Date   : 2022-02-26T10:52:11+07:00
Stats  : +16/-53 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/plexus-i18n/c/c1de82058115cc9b8c8f6d1dedf4f601b0a1a365?branch=epel10

Log:
Remove patches and use pom_* macros instead

---
diff --git a/plexus-i18n-migration-to-component-metadata.patch b/plexus-i18n-migration-to-component-metadata.patch
deleted file mode 100644
index 06f2702..0000000
--- a/plexus-i18n-migration-to-component-metadata.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur plexus-i18n-1.0-beta-10.orig/pom.xml plexus-i18n-1.0-beta-10/pom.xml
---- plexus-i18n-1.0-beta-10.orig/pom.xml	2008-08-15 21:11:54.000000000 +0200
-+++ plexus-i18n-1.0-beta-10/pom.xml	2011-07-28 15:43:00.813980336 +0200
-@@ -26,12 +26,11 @@
-     <plugins>
-       <plugin>
-         <groupId>org.codehaus.plexus</groupId>
--        <artifactId>plexus-maven-plugin</artifactId>
--        <version>1.3.5</version>
-+        <artifactId>plexus-component-metadata</artifactId>
-         <executions>
-           <execution>
-             <goals>
--              <goal>descriptor</goal>
-+              <goal>generate-metadata</goal>
-             </goals>
-           </execution>
-         </executions>

diff --git a/plexus-i18n-plexus-container-default-missing.patch b/plexus-i18n-plexus-container-default-missing.patch
deleted file mode 100644
index 2238438..0000000
--- a/plexus-i18n-plexus-container-default-missing.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur plexus-i18n-1.0-beta-10.orig/pom.xml plexus-i18n-1.0-beta-10/pom.xml
---- plexus-i18n-1.0-beta-10.orig/pom.xml	2012-03-06 15:41:05.000000000 +0100
-+++ plexus-i18n-1.0-beta-10/pom.xml	2012-03-06 15:54:20.383999743 +0100
-@@ -50,6 +50,11 @@
-       <artifactId>plexus-utils</artifactId>
-       <version>1.4.5</version>
-     </dependency>
-+    <dependency>
-+      <groupId>org.codehaus.plexus</groupId>
-+      <artifactId>plexus-container-default</artifactId>
-+      <version>1.0-alpha-9-stable-1</version>
-+    </dependency>
-   </dependencies>
- 
-   <scm>

diff --git a/plexus-i18n.spec b/plexus-i18n.spec
index 452dfac..5050d98 100644
--- a/plexus-i18n.spec
+++ b/plexus-i18n.spec
@@ -1,21 +1,13 @@
-%define parent plexus
-%define subname i18n
-
 Name:           plexus-i18n
 Version:        1.0
-Release:        0.22.b10.4%{?dist}
+Release:        0.23.b10.4%{?dist}
 Summary:        Plexus I18N Component
 License:        ASL 2.0
 URL:            https://github.com/codehaus-plexus/plexus-i18n
 BuildArch:      noarch
-
 # svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-i18n-1.0-beta-10/
 # tar cjf plexus-i18n-1.0-beta-10-src.tar.bz2 plexus-i18n-1.0-beta-10/
 Source0:        plexus-i18n-1.0-beta-10-src.tar.bz2
-
-Patch0:         %{name}-migration-to-component-metadata.patch
-Patch1:         %{name}-plexus-container-default-missing.patch
-
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-components:pom:)
@@ -30,17 +22,18 @@ reusable components for hibernate, form processing, jndi, i18n,
 velocity, etc. Plexus also includes an application server which 
 is like a J2EE application server, without all the baggage.
 
-%package javadoc
-Summary:        Javadoc for %{name}
-
-%description javadoc
-Javadoc for %{name}.
+%{?javadoc_package}
 
 %prep
-%setup -q -n plexus-i18n-1.0-beta-10
-%patch0 -p1
-%patch1 -p1
-
+# -n: base directory name
+%autosetup -n plexus-i18n-1.0-beta-10
+# plexus maven plugin is deprecated
+# switched it to plexus-component-metadata
+%pom_xpath_set 'pom:plugin[pom:artifactId = "plexus-maven-plugin"]/pom:artifactId' plexus-component-metadata
+# set goal to generate-metadata
+%pom_xpath_set 'pom:goals[pom:goal = "descriptor"]/pom:goal' generate-metadata
+# add missing dep: plexus-container-default
+%pom_add_dep org.codehaus.plexus:plexus-container-default
 # remove maven-compiler-plugin configuration that is broken with Java 11
 %pom_xpath_remove 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration'
 
@@ -52,9 +45,12 @@ Javadoc for %{name}.
 
 %files -f .mfiles
 
-%files javadoc -f .mfiles-javadoc
-
 %changelog
+* Sat Feb 26 2022 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.0-0.23.b10.4
+- Remove patches and use pom_* macros instead
+- Use javadoc_package for javadoc subpackage
+- Use autosetup macros instead of setup
+
 * Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.0-0.22.b10.4
 - Rebuilt for java-17-openjdk as system jdk