From dc5457894e985caf2f9e1c40fa9a0dcf4d84adcd8dd50fbdcc26283215f0cd72 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 11 Dec 2018 12:30:13 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/cglib?expand=0&rev=24 --- cglib.changes | 6 ++++++ cglib.spec | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cglib.changes b/cglib.changes index 455554d..d071711 100644 --- a/cglib.changes +++ b/cglib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 11 12:27:40 UTC 2018 - Fridrich Strba + +- 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 diff --git a/cglib.spec b/cglib.spec index 640abde..78c6982 100644 --- a/cglib.spec +++ b/cglib.spec @@ -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