From 8e4b80a4d3003d527b3b3fda6b0e06799f818b2e5454f2a1200f63e86d08b0b2 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 29 Sep 2023 13:12:38 +0000
Subject: [PATCH 1/2] Accepting request 1114352 from Java:packages:test

javapackages >= 6

OBS-URL: https://build.opensuse.org/request/show/1114352
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-chain?expand=0&rev=9
---
 apache-commons-chain.spec | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/apache-commons-chain.spec b/apache-commons-chain.spec
index 1859229..12191e0 100644
--- a/apache-commons-chain.spec
+++ b/apache-commons-chain.spec
@@ -42,11 +42,8 @@ BuildRequires:  commons-digester >= 1.8
 BuildRequires:  commons-logging
 BuildRequires:  fdupes
 BuildRequires:  glassfish-servlet-api
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  portlet-1.0-api
-Requires:       mvn(commons-beanutils:commons-beanutils)
-Requires:       mvn(commons-digester:commons-digester) >= 1.8
-Requires:       mvn(commons-logging:commons-logging)
 BuildArch:      noarch
 %if %{with tests}
 BuildRequires:  ant-junit
@@ -102,8 +99,6 @@ rm -rf src/java/org/apache/commons/chain/web/faces
 %pom_xpath_set "pom:dependency[pom:groupId = 'javax.servlet' ]/pom:artifactId" javax.servlet-api
 %pom_xpath_set "pom:dependency[pom:groupId = 'javax.servlet' ]/pom:version" 3.1.0
 
-%pom_remove_parent
-
 %build
 export CLASSPATH=$(build-classpath \
                    commons-logging \
@@ -127,7 +122,7 @@ install -pm 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name
 ln -s %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
 # pom
 install -d -m 0755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
 %add_maven_depmap %{name}.pom %{name}.jar -a org.apache.commons:%{short_name}
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}

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

Prepare for RPM 4.20

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

diff --git a/apache-commons-chain.changes b/apache-commons-chain.changes
index 6abbe2c..0b94683 100644
--- a/apache-commons-chain.changes
+++ b/apache-commons-chain.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 20 10:23:30 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Wed Mar 23 23:01:17 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/apache-commons-chain.spec b/apache-commons-chain.spec
index 12191e0..8dbe4e8 100644
--- a/apache-commons-chain.spec
+++ b/apache-commons-chain.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-chain
 #
-# Copyright (c) 2022 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
@@ -83,10 +83,10 @@ mkdir -p target/lib
 
 sed -i 's/\r$//g;' *.txt
 
-%patch0 -p1
-%patch1
-%patch3 -p1
-%patch4 -p1
+%patch -P 0 -p1
+%patch -P 1
+%patch -P 3 -p1
+%patch -P 4 -p1
 
 # Failed tests:   testDefaut(org.apache.commons.chain.config.ConfigParserTestCase):
 # Correct command count expected:<17> but was:<19>