From 7060754b65098f38ad68a1ca501cba35a9d9c005d67a176df5c054a2f52d156d Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 29 Sep 2023 13:11:20 +0000
Subject: [PATCH 1/2] Accepting request 1114353 from Java:packages:test

javapackages >= 6

OBS-URL: https://build.opensuse.org/request/show/1114353
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-cli?expand=0&rev=37
---
 apache-commons-cli-build.xml | 1 -
 apache-commons-cli.spec      | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apache-commons-cli-build.xml b/apache-commons-cli-build.xml
index 76b91c7..5095940 100644
--- a/apache-commons-cli-build.xml
+++ b/apache-commons-cli-build.xml
@@ -70,7 +70,6 @@
              packagenames="*" 
              destdir="${reporting.outputDirectory}/apidocs" 
              access="protected" 
-             old="false" 
              verbose="false" 
              encoding="iso-8859-1" 
              version="true" 
diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec
index 9c993c1..469f140 100644
--- a/apache-commons-cli.spec
+++ b/apache-commons-cli.spec
@@ -31,7 +31,7 @@ Source2:        apache-commons-cli-rpmlintrc
 Patch0:         CLI-253-workaround.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 Provides:       jakarta-%{short_name} = %{version}-%{release}
 Obsoletes:      jakarta-%{short_name} < %{version}-%{release}
 Provides:       apache-cli = %{version}-%{release}
@@ -59,7 +59,7 @@ cp %{SOURCE1} build.xml
 %pom_remove_parent
 
 %build
-%ant package javadoc
+%{ant} package javadoc
 
 %install
 # jars
@@ -68,7 +68,7 @@ ln -sf %{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
 
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
 %add_maven_depmap %{short_name}.pom %{short_name}.jar -a "org.apache.commons:%{short_name}"
 
 # javadoc

From b7ba0fb35d95aadf352fad02d00ee3540c7422324adebea34b4627966ec4d232 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 20 Feb 2024 11:53:18 +0000
Subject: [PATCH 2/2] Accepting request 1147772 from home:dimstar:rpm4.20:a

Prepare for RPM 4.20

OBS-URL: https://build.opensuse.org/request/show/1147772
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-cli?expand=0&rev=38
---
 apache-commons-cli.changes | 5 +++++
 apache-commons-cli.spec    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apache-commons-cli.changes b/apache-commons-cli.changes
index 7297428..a08e443 100644
--- a/apache-commons-cli.changes
+++ b/apache-commons-cli.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 20 10:25:28 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Thu Sep 21 05:39:25 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec
index 469f140..383f6cb 100644
--- a/apache-commons-cli.spec
+++ b/apache-commons-cli.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-cli
 #
-# 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
@@ -54,7 +54,7 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{short_name}-%{version}-src
 cp %{SOURCE1} build.xml
-%patch0 -p1
+%patch -P 0 -p1
 
 %pom_remove_parent