Accepting request 1148111 from Java:packages

rpm 4.20 compat

OBS-URL: https://build.opensuse.org/request/show/1148111
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-build-api?expand=0&rev=5
This commit is contained in:
Ana Guerrero 2024-02-20 20:15:51 +00:00 committed by Git OBS Bridge
commit 254700b81f
2 changed files with 10 additions and 6 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 20 14:43:01 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use %patch -P N instead of deprecated %patchN.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 19 06:23:14 UTC 2022 - Fridrich Strba <fstrba@suse.com> Thu May 19 06:23:14 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package plexus-build-api # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -31,12 +31,11 @@ Patch0: plexus-build-api-utils-3.3.0.patch
Patch1: plexus-build-api-javadoc.patch Patch1: plexus-build-api-javadoc.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
BuildRequires: plexus-classworlds BuildRequires: plexus-classworlds
BuildRequires: plexus-containers-container-default BuildRequires: plexus-containers-container-default
BuildRequires: plexus-metadata-generator BuildRequires: plexus-metadata-generator
BuildRequires: plexus-utils BuildRequires: plexus-utils
Requires: mvn(org.codehaus.plexus:plexus-utils)
BuildArch: noarch BuildArch: noarch
%description %description
@ -51,8 +50,8 @@ API documentation for %{name}.
%prep %prep
%setup -q -n sonatype-sisu-build-api-f1f8849 %setup -q -n sonatype-sisu-build-api-f1f8849
%patch0 -p1 %patch -P 0 -p1
%patch1 -p1 %patch -P 1 -p1
cp -p %{SOURCE1} . cp -p %{SOURCE1} .
cp -p %{SOURCE2} build.xml cp -p %{SOURCE2} build.xml
@ -70,7 +69,7 @@ install -dm 0755 %{buildroot}%{_javadir}/plexus
install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/%{name}.jar install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/%{name}.jar
# pom # pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus 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 %add_maven_depmap plexus/%{name}.pom plexus/%{name}.jar
# javadoc # javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name} install -dm 0755 %{buildroot}%{_javadocdir}/%{name}