Accepting request 1148771 from Java:packages

rpm 4.20 compat

OBS-URL: https://build.opensuse.org/request/show/1148771
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-shared-utils?expand=0&rev=6
This commit is contained in:
Ana Guerrero 2024-02-21 17:01:55 +00:00 committed by Git OBS Bridge
commit 90fab33668
2 changed files with 9 additions and 9 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 21 15:14:20 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use %patch -P N instead of deprecated %patchN.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 3 11:24:22 UTC 2023 - Fridrich Strba <fstrba@suse.com> Wed May 3 11:24:22 UTC 2023 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package maven-shared-utils # spec file for package maven-shared-utils
# #
# Copyright (c) 2023 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
@ -32,7 +32,7 @@ BuildRequires: ant
BuildRequires: apache-commons-io BuildRequires: apache-commons-io
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: jansi BuildRequires: jansi
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
BuildRequires: jsr-305 BuildRequires: jsr-305
BuildRequires: plexus-classworlds BuildRequires: plexus-classworlds
BuildRequires: plexus-containers-container-default BuildRequires: plexus-containers-container-default
@ -66,12 +66,7 @@ API documentation for %{name}.
%setup -q %setup -q
cp %{SOURCE1} build.xml cp %{SOURCE1} build.xml
%patch0 -p1 %patch -P 0 -p1
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
%pom_remove_parent .
%pom_xpath_inject pom:project "<groupId>org.apache.maven.shared</groupId>" .
%build %build
mkdir -p lib mkdir -p lib
@ -95,7 +90,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{name}
install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
# pom # pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
# javadoc # javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name} install -dm 0755 %{buildroot}%{_javadocdir}/%{name}