From c8c8d93cd68d2664ee028afa48d59dee32a693799e080eb6dd6227f99bbdfa82 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2023 13:32:40 +0000 Subject: [PATCH 1/2] Accepting request 1114371 from Java:packages:test javapackages >= 6 OBS-URL: https://build.opensuse.org/request/show/1114371 OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-build-api?expand=0&rev=10 --- plexus-build-api.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plexus-build-api.spec b/plexus-build-api.spec index e88415d..640785c 100644 --- a/plexus-build-api.spec +++ b/plexus-build-api.spec @@ -31,12 +31,11 @@ Patch0: plexus-build-api-utils-3.3.0.patch Patch1: plexus-build-api-javadoc.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: plexus-classworlds BuildRequires: plexus-containers-container-default BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils -Requires: mvn(org.codehaus.plexus:plexus-utils) BuildArch: noarch %description @@ -70,7 +69,7 @@ install -dm 0755 %{buildroot}%{_javadir}/plexus install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/%{name}.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/plexus/%{name}.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/plexus/%{name}.pom %add_maven_depmap plexus/%{name}.pom plexus/%{name}.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} From c3e2ed8a2a9be3eb6bdd42f0da69e05a782c4bb8df7309a903698b37a180ff9a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 20 Feb 2024 14:43:13 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-build-api?expand=0&rev=11 --- plexus-build-api.changes | 5 +++++ plexus-build-api.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plexus-build-api.changes b/plexus-build-api.changes index 44d3835..c5bc188 100644 --- a/plexus-build-api.changes +++ b/plexus-build-api.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 20 14:43:01 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Thu May 19 06:23:14 UTC 2022 - Fridrich Strba diff --git a/plexus-build-api.spec b/plexus-build-api.spec index 640785c..40aea11 100644 --- a/plexus-build-api.spec +++ b/plexus-build-api.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-build-api # -# 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 @@ -50,8 +50,8 @@ API documentation for %{name}. %prep %setup -q -n sonatype-sisu-build-api-f1f8849 -%patch0 -p1 -%patch1 -p1 +%patch -P 0 -p1 +%patch -P 1 -p1 cp -p %{SOURCE1} . cp -p %{SOURCE2} build.xml