Accepting request 657168 from Java:packages

Build against objectweb-asm

OBS-URL: https://build.opensuse.org/request/show/657168
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cglib?expand=0&rev=20
This commit is contained in:
Dominique Leuenberger 2018-12-14 19:44:45 +00:00 committed by Git OBS Bridge
commit 6103a65dce
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 11 12:27:40 UTC 2018 - Fridrich Strba <fstrba@suse.com>
- Build with objectweb-asm >= 5 in order not get stuck on a
particular asmN dependency
-------------------------------------------------------------------
Mon Oct 29 14:24:03 UTC 2018 - Fridrich Strba <fstrba@suse.com>

View File

@ -30,12 +30,11 @@ Source1: http://central.maven.org/maven2/%{name}/%{name}/%{version}/%{nam
Patch0: %{name}-build_xml.patch
Patch1: fix-javadoc.patch
BuildRequires: ant >= 1.6
# Needed for maven conversions
BuildRequires: asm5
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
# Needed for maven conversions
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: objectweb-asm >= 5
Provides: %{name}-nohook = %{version}-%{release}
Obsoletes: %{name}-nohook < %{version}-%{release}
BuildArch: noarch
@ -57,7 +56,7 @@ runtime.
%prep
%setup -q -n %{name}-%{tarball_name}
rm lib/*.jar
build-jar-repository -s -p lib asm5 ant
build-jar-repository -s -p lib objectweb-asm ant
%patch0 -p1
%patch1 -p1