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
This commit is contained in:
Fridrich Strba 2024-02-20 11:57:42 +00:00 committed by Git OBS Bridge
parent 8c2d7f2168
commit 21aaae8da8
2 changed files with 8 additions and 14 deletions

View File

@ -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

View File

@ -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