rpm/plexus-bsh-factory
SHA256
1
0
Fork 0
forked from pool/plexus-bsh-factory
Code Pull Requests Activity

Accepting request 1148110 from Java:packages

Browse Source 
rpm 4.20 compat

OBS-URL: https://build.opensuse.org/request/show/1148110
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-bsh-factory?expand=0&rev=3
This commit is contained in:
Ana Guerrero 2024-02-20 20:15:50 +00:00 committed by Git OBS Bridge
commit 582a100381
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plexus-bsh-factory.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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> Sun Mar 20 17:56:04 UTC 2022 - Fridrich Strba <fstrba@suse.com>

16
plexus-bsh-factory.spec
View File

@ -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 # 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
@ -38,14 +38,10 @@ Patch2: 0001-Migrate-to-plexus-containers-container-default.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: bsh2 BuildRequires: bsh2
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
BuildRequires: plexus-classworlds >= 2 BuildRequires: plexus-classworlds >= 2
BuildRequires: plexus-containers-container-default BuildRequires: plexus-containers-container-default
BuildRequires: plexus-utils 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 BuildArch: noarch
%description %description
@ -61,8 +57,8 @@ Javadoc for %{name}.
%prep %prep
%setup -q -n %{name} %setup -q -n %{name}
%patch1 -b .sav %patch -P 1 -b .sav
%patch2 -p1 %patch -P 2 -p1
cp release-pom.xml pom.xml cp release-pom.xml pom.xml
cp %{SOURCE1} build.xml cp %{SOURCE1} build.xml
cp -p %{SOURCE3} . cp -p %{SOURCE3} .
@ -80,7 +76,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{parent}
install -pm 0644 target/%{name}-%{namedversion}.jar %{buildroot}%{_javadir}/%{parent}/%{subname}.jar install -pm 0644 target/%{name}-%{namedversion}.jar %{buildroot}%{_javadir}/%{parent}/%{subname}.jar
# pom # pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{parent} 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 %add_maven_depmap %{parent}/%{subname}.pom %{parent}/%{subname}.jar
# javadoc # javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name} install -dm 0755 %{buildroot}%{_javadocdir}/%{name}