From 44981ce293e0ce4c9411c16950dd45414045a43b10c6a8d9a7d71800c09e7b2a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 4 Oct 2017 08:01:43 +0000 Subject: [PATCH] Don't depend on java-gcj-compat OBS-URL: https://build.opensuse.org/package/show/Java:packages/objectweb-asm?expand=0&rev=35 --- asm-3.3.1-sourcetarget.patch | 11 +++++++++++ objectweb-asm.spec | 9 +++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 asm-3.3.1-sourcetarget.patch diff --git a/asm-3.3.1-sourcetarget.patch b/asm-3.3.1-sourcetarget.patch new file mode 100644 index 0000000..5602597 --- /dev/null +++ b/asm-3.3.1-sourcetarget.patch @@ -0,0 +1,11 @@ +--- asm-3.3.1/build.xml 2009-07-11 17:56:57.000000000 +0200 ++++ asm-3.3.1/build.xml 2017-10-04 09:56:20.226981298 +0200 +@@ -170,7 +170,7 @@ + + + +- ++ + + + diff --git a/objectweb-asm.spec b/objectweb-asm.spec index c5a6775..8d134fb 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -34,8 +34,9 @@ Source7: http://repo1.maven.org/maven2/asm/asm-all/3.3.1/asm-all-3.3.1.po Source8: http://repo1.maven.org/maven2/asm/asm-parent/3.3.1/asm-parent-3.3.1.pom Source9: asm-MANIFEST.MF Patch0: objectweb-asm-no-classpath-in-manifest.patch +Patch1: asm-3.3.1-sourcetarget.patch BuildRequires: ant >= 1.6.5 -BuildRequires: java-1_5_0-gcj-compat-devel +BuildRequires: java-devel >= 1.6 BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: objectweb-anttask @@ -60,6 +61,7 @@ smaller. %prep %setup -q -n asm-%{version} %patch0 -p1 +%patch1 -p1 perl -pi -e 's/\r$//g' LICENSE.txt README.txt mkdir META-INF cp -p %{SOURCE9} META-INF/MANIFEST.MF @@ -67,7 +69,10 @@ cp -p %{SOURCE9} META-INF/MANIFEST.MF %build export CLASSPATH= export OPT_JAR_LIST=: -ant -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) jar +ant \ + -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) \ + -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ + jar %install # jars