From 4ea6b69934830db8f653a544eb105f3a54837f6af2f54d75e5e24c476b443711 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 29 Sep 2023 13:32:49 +0000
Subject: [PATCH 1/2] Accepting request 1114370 from Java:packages:test

OBS-URL: https://build.opensuse.org/request/show/1114370
OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-bsh-factory?expand=0&rev=5
---
 plexus-bsh-factory-build.xml | 2 +-
 plexus-bsh-factory.changes   | 5 -----
 plexus-bsh-factory.spec      | 8 ++------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/plexus-bsh-factory-build.xml b/plexus-bsh-factory-build.xml
index 19561fa..8256486 100644
--- a/plexus-bsh-factory-build.xml
+++ b/plexus-bsh-factory-build.xml
@@ -12,7 +12,7 @@
   <property name="project.artifactId" value="plexus-bsh-factory"/>
   <property name="project.version" value="1.0-alpha-7"/>
 
-  <property name="compiler.source" value="1.8"/>
+  <property name="compiler.source" value="1.6"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
diff --git a/plexus-bsh-factory.changes b/plexus-bsh-factory.changes
index fc1b50f..f10ea74 100644
--- a/plexus-bsh-factory.changes
+++ b/plexus-bsh-factory.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Sun Mar 20 17:56:04 UTC 2022 - Fridrich Strba <fstrba@suse.com>
-
-- Build with source and target levels 8
-
 -------------------------------------------------------------------
 Fri Mar  8 09:43:38 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/plexus-bsh-factory.spec b/plexus-bsh-factory.spec
index 58844ca..9f6562b 100644
--- a/plexus-bsh-factory.spec
+++ b/plexus-bsh-factory.spec
@@ -38,14 +38,10 @@ Patch2:         0001-Migrate-to-plexus-containers-container-default.patch
 BuildRequires:  ant
 BuildRequires:  bsh2
 BuildRequires:  fdupes
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  plexus-classworlds >= 2
 BuildRequires:  plexus-containers-container-default
 BuildRequires:  plexus-utils
-Requires:       mvn(bsh:bsh)
-Requires:       mvn(classworlds:classworlds)
-Requires:       mvn(org.codehaus.plexus:plexus-container-default)
-Requires:       mvn(org.codehaus.plexus:plexus-utils)
 BuildArch:      noarch
 
 %description
@@ -80,7 +76,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{parent}
 install -pm 0644 target/%{name}-%{namedversion}.jar %{buildroot}%{_javadir}/%{parent}/%{subname}.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{parent}
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{parent}/%{subname}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{parent}/%{subname}.pom
 %add_maven_depmap %{parent}/%{subname}.pom %{parent}/%{subname}.jar
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}

From b923ab2758b8e79a67ec0a0c7930c4e8b41a203fd8692ea57d5a5d149ddfb976 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 20 Feb 2024 14:42:18 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/plexus-bsh-factory?expand=0&rev=6

---
 plexus-bsh-factory.changes | 10 ++++++++++
 plexus-bsh-factory.spec    |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/plexus-bsh-factory.changes b/plexus-bsh-factory.changes
index f10ea74..50038b5 100644
--- a/plexus-bsh-factory.changes
+++ b/plexus-bsh-factory.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Feb 20 14:42:08 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
+-------------------------------------------------------------------
+Sun Mar 20 17:56:04 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with source and target levels 8
+
 -------------------------------------------------------------------
 Fri Mar  8 09:43:38 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/plexus-bsh-factory.spec b/plexus-bsh-factory.spec
index 9f6562b..e481661 100644
--- a/plexus-bsh-factory.spec
+++ b/plexus-bsh-factory.spec
@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package plexus-bsh-factory
 #
-# 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
@@ -57,8 +57,8 @@ Javadoc for %{name}.
 %prep
 %setup -q -n %{name}
 
-%patch1 -b .sav
-%patch2 -p1
+%patch -P 1 -b .sav
+%patch -P 2 -p1
 cp release-pom.xml pom.xml
 cp %{SOURCE1} build.xml
 cp -p %{SOURCE3} .