From a02c04d77be2206678a4a1049e471eb630c2d843ac3df368af942d6d8ce0b24d Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Wed, 25 Sep 2013 12:03:23 +0000 Subject: [PATCH 1/2] - Build with gcc-java as openjdk7 (1.7.0_40) fails to build it OBS-URL: https://build.opensuse.org/package/show/Java:packages/objectweb-asm?expand=0&rev=28 --- objectweb-asm.changes | 5 +++++ objectweb-asm.spec | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/objectweb-asm.changes b/objectweb-asm.changes index 653d577..716945a 100644 --- a/objectweb-asm.changes +++ b/objectweb-asm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 12:03:11 UTC 2013 - mvyskocil@suse.com + +- Build with gcc-java as openjdk7 (1.7.0_40) fails to build it + ------------------------------------------------------------------- Wed Sep 11 07:32:22 UTC 2013 - mvyskocil@suse.com diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 3b99d1d..8b1a251 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -40,7 +40,7 @@ Patch0: objectweb-asm-no-classpath-in-manifest.patch Requires: xml-commons-apis PreReq: javapackages-tools BuildRequires: ant >= 1.6.5 -BuildRequires: java-devel +BuildRequires: java-1_5_0-gcj-compat-devel BuildRequires: javapackages-tools BuildRequires: objectweb-anttask BuildRequires: xml-commons-apis @@ -59,6 +59,7 @@ Machine. ASM offers similar functionalities as BCEL or SERP, but is much smaller. +%if 0 %package javadoc Summary: Javadoc for %{name} Group: Development/Libraries/Java @@ -73,6 +74,7 @@ Machine. ASM offers similar functionalities as BCEL or SERP, but is much smaller. +%endif %prep %setup -q -n asm-%{version} @@ -84,7 +86,7 @@ cp -p %{SOURCE9} META-INF/MANIFEST.MF %build export CLASSPATH= export OPT_JAR_LIST=: -ant -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) jar jdoc +ant -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) jar %install # jars @@ -123,9 +125,11 @@ install -m 644 %{SOURCE7} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-all. install -m 644 %{SOURCE8} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-parent.pom %add_maven_depmap JPP.objectweb-asm-asm-all.pom %{name}/asm-all.jar +%if 0 # javadoc install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr output/dist/doc/javadoc/user/* %{buildroot}%{_javadocdir}/%{name} +%endif %files %defattr(0644,root,root,0755) @@ -135,8 +139,10 @@ cp -pr output/dist/doc/javadoc/user/* %{buildroot}%{_javadocdir}/%{name} %{_mavenpomdir}/* %config %{_mavendepmapfragdir}/* +%if 0 %files javadoc %defattr(0644,root,root,0755) %{_javadocdir}/%{name} +%endif %changelog From 91043bf77a1ee35f72c1b6048cb305c358a743458554114789cd5461bea5f067 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Wed, 25 Sep 2013 12:03:40 +0000 Subject: [PATCH 2/2] - Disable javadoc package OBS-URL: https://build.opensuse.org/package/show/Java:packages/objectweb-asm?expand=0&rev=29 --- objectweb-asm.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/objectweb-asm.changes b/objectweb-asm.changes index 716945a..db853f3 100644 --- a/objectweb-asm.changes +++ b/objectweb-asm.changes @@ -2,6 +2,7 @@ Wed Sep 25 12:03:11 UTC 2013 - mvyskocil@suse.com - Build with gcc-java as openjdk7 (1.7.0_40) fails to build it +- Disable javadoc package ------------------------------------------------------------------- Wed Sep 11 07:32:22 UTC 2013 - mvyskocil@suse.com