From 21aaae8da85acccbb23280a1e533b8691cabc3364e80e4e2c37e07ccdd17f645 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 20 Feb 2024 11:57:42 +0000 Subject: [PATCH 1/3] Accepting request 1147840 from home:dimstar:rpm4.20:a Prepare for RPM 4.20 OBS-URL: https://build.opensuse.org/request/show/1147840 OBS-URL: https://build.opensuse.org/package/show/Java:packages/aqute-bnd?expand=0&rev=40 --- aqute-bnd.spec | 12 ++++++------ bnd-maven-plugin.spec | 10 ++-------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/aqute-bnd.spec b/aqute-bnd.spec index cc0e44d..67587ca 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -1,7 +1,7 @@ # # spec file for package aqute-bnd # -# 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 @@ -86,11 +86,11 @@ mkdir -p lib build-jar-repository -s lib \ slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium ant jline -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%patch -P 1 -p1 +%patch -P 2 -p1 +%patch -P 3 -p1 +%patch -P 4 -p1 +%patch -P 5 -p1 # the commands pull in more dependencies than we want (felix-resolver, jetty) rm biz.aQute.bnd/src/aQute/bnd/main/{ExportReportCommand,MbrCommand,RemoteCommand,ReporterLogger,ResolveCommand,Shell}.java diff --git a/bnd-maven-plugin.spec b/bnd-maven-plugin.spec index ccf7a98..554ad28 100644 --- a/bnd-maven-plugin.spec +++ b/bnd-maven-plugin.spec @@ -1,7 +1,7 @@ # # spec file for package bnd-maven-plugin # -# 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 @@ -49,13 +49,7 @@ Group: Development/Libraries/Java API documentation for %{name}. %prep -%setup -q -n bnd-%{version} - -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%autosetup -p1 -n bnd-%{version} cp -r biz.aQute.bnd.maven/src/aQute/bnd/maven/lib/configuration maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib cp -r biz.aQute.bnd.maven/src/aQute/bnd/maven/lib/executions maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib From c8f8bcef60d45a57289166cc3d984f0880936e53d59c5a5e6812e56a4bca83dd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 20 Feb 2024 13:30:28 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/aqute-bnd?expand=0&rev=41 --- bnd-maven-plugin.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bnd-maven-plugin.spec b/bnd-maven-plugin.spec index 554ad28..b9909c6 100644 --- a/bnd-maven-plugin.spec +++ b/bnd-maven-plugin.spec @@ -49,7 +49,13 @@ Group: Development/Libraries/Java API documentation for %{name}. %prep -%autosetup -p1 -n bnd-%{version} +%setup -q -n bnd-%{version} + +%patch -P 1 -p1 +%patch -P 2 -p1 +%patch -P 3 -p1 +%patch -P 4 -p1 +%patch -P 5 -p1 cp -r biz.aQute.bnd.maven/src/aQute/bnd/maven/lib/configuration maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib cp -r biz.aQute.bnd.maven/src/aQute/bnd/maven/lib/executions maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib From 7f16e7ca357c55307f9827eace10c88bb2ebf46397b56324c5107490ab0c2e3b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 20 Feb 2024 13:31:16 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/aqute-bnd?expand=0&rev=42 --- aqute-bnd.changes | 5 +++++ bnd-maven-plugin.changes | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/aqute-bnd.changes b/aqute-bnd.changes index 2eff192..7840424 100644 --- a/aqute-bnd.changes +++ b/aqute-bnd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 20 13:31:03 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Mon Sep 18 05:23:18 UTC 2023 - Fridrich Strba diff --git a/bnd-maven-plugin.changes b/bnd-maven-plugin.changes index 07213a0..a178ecf 100644 --- a/bnd-maven-plugin.changes +++ b/bnd-maven-plugin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 20 13:31:04 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Mon Sep 18 05:23:18 UTC 2023 - Fridrich Strba