Don't depend on java-gcj-compat

OBS-URL: https://build.opensuse.org/package/show/Java:packages/objectweb-asm?expand=0&rev=35
This commit is contained in:
Fridrich Strba 2017-10-04 08:01:43 +00:00 committed by Git OBS Bridge
parent feb1f6f0ba
commit 44981ce293
2 changed files with 18 additions and 2 deletions

View File

@ -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 @@
</target>
<target name="compile-debug" depends="init,compile-init,compile-config">
- <javac destdir="${out.build}/tmp" debug="on" source="1.3" target="1.2">
+ <javac destdir="${out.build}/tmp" debug="on">
<classpath>
<pathelement location="${out.build}/tmp"/>
</classpath>

View File

@ -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 Source8: http://repo1.maven.org/maven2/asm/asm-parent/3.3.1/asm-parent-3.3.1.pom
Source9: asm-MANIFEST.MF Source9: asm-MANIFEST.MF
Patch0: objectweb-asm-no-classpath-in-manifest.patch Patch0: objectweb-asm-no-classpath-in-manifest.patch
Patch1: asm-3.3.1-sourcetarget.patch
BuildRequires: ant >= 1.6.5 BuildRequires: ant >= 1.6.5
BuildRequires: java-1_5_0-gcj-compat-devel BuildRequires: java-devel >= 1.6
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: objectweb-anttask BuildRequires: objectweb-anttask
@ -60,6 +61,7 @@ smaller.
%prep %prep
%setup -q -n asm-%{version} %setup -q -n asm-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1
perl -pi -e 's/\r$//g' LICENSE.txt README.txt perl -pi -e 's/\r$//g' LICENSE.txt README.txt
mkdir META-INF mkdir META-INF
cp -p %{SOURCE9} META-INF/MANIFEST.MF cp -p %{SOURCE9} META-INF/MANIFEST.MF
@ -67,7 +69,10 @@ cp -p %{SOURCE9} META-INF/MANIFEST.MF
%build %build
export CLASSPATH= export CLASSPATH=
export OPT_JAR_LIST=: 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 %install
# jars # jars